[gentoo-commits] gentoo-x86 commit in media-sound/noteedit/files: noteedit-2.8.1-desktop-file.patch noteedit-2.8.1+gcc-4.3.patch

[Diego Petteno (flameeyes)]

flameeyes    08/04/21 14:19:38

  Modified:             noteedit-2.8.1-desktop-file.patch
  Added:                noteedit-2.8.1+gcc-4.3.patch
  Log:
  Add a patch to build with GCC 4.3. Also fixes bug #211037 by patching the .desktop file further.
  (Portage version: 2.1.5_rc5)

Revision  Changes    Path
1.2                  media-sound/noteedit/files/noteedit-2.8.1-desktop-file.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/noteedit/files/noteedit-2.8.1-desktop-file.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/noteedit/files/noteedit-2.8.1-desktop-file.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/noteedit/files/noteedit-2.8.1-desktop-file.patch?r1=1.1&r2=1.2

Index: noteedit-2.8.1-desktop-file.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/noteedit/files/noteedit-2.8.1-desktop-file.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- noteedit-2.8.1-desktop-file.patch	23 Jun 2007 17:28:21 -0000	1.1
+++ noteedit-2.8.1-desktop-file.patch	21 Apr 2008 14:19:38 -0000	1.2
@@ -1,3 +1,28 @@
+See bug #211037.
+Index: noteedit-2.8.1/noteedit/noteedit.desktop
+===================================================================
+--- noteedit-2.8.1.orig/noteedit/noteedit.desktop
++++ noteedit-2.8.1/noteedit/noteedit.desktop
+@@ -5,16 +5,15 @@ Name[sv]=Notredigerare
+ Name[pl]=Edytor nut
+ Name[sl]=NoteEdit
+ Exec=noteedit %i %m -caption "%c"
+-MimeType=audio/x-notes
++MimeType=audio/x-notes;
+ Type=Application
+ Comment=Note editor
+ Comment[de]=Noteneditor
+ Comment[sv]=Notredigerare
+ Comment[pl]=Edytor nut
+ Comment[sl]=Urejevalnik glasbenih dokumentov
+-Terminal=0
++Terminal=false
+ Icon=noteedit
+ ServiceTypes=Browser/View
+ X-KDE-Library=libnoteedit
+-Categories=Qt;KDE;Audio;
+-Encoding=UTF-8
++Categories=Qt;KDE;AudioVideo;Audio;Midi;
 Index: noteedit-2.8.1/noteedit/icons/Makefile.am
 ===================================================================
 --- noteedit-2.8.1.orig/noteedit/icons/Makefile.am
@@ -13,19 +38,3 @@
 +appicon_ICON = noteedit
 +
 +appicondir = ${prefix}/share/icons
-Index: noteedit-2.8.1/noteedit/noteedit.desktop
-===================================================================
---- noteedit-2.8.1.orig/noteedit/noteedit.desktop
-+++ noteedit-2.8.1/noteedit/noteedit.desktop
-@@ -12,9 +12,9 @@ Comment[de]=Noteneditor
- Comment[sv]=Notredigerare
- Comment[pl]=Edytor nut
- Comment[sl]=Urejevalnik glasbenih dokumentov
--Terminal=0
-+Terminal=false
- Icon=noteedit
- ServiceTypes=Browser/View
- X-KDE-Library=libnoteedit
--Categories=Qt;KDE;Audio;
-+Categories=Qt;KDE;AudioVideo;Audio;Midi;
- Encoding=UTF-8



1.1                  media-sound/noteedit/files/noteedit-2.8.1+gcc-4.3.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/noteedit/files/noteedit-2.8.1+gcc-4.3.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/noteedit/files/noteedit-2.8.1+gcc-4.3.patch?rev=1.1&content-type=text/plain

Index: noteedit-2.8.1+gcc-4.3.patch
===================================================================
Index: noteedit-2.8.1/noteedit/keyoffs.cpp
===================================================================
--- noteedit-2.8.1.orig/noteedit/keyoffs.cpp
+++ noteedit-2.8.1/noteedit/keyoffs.cpp
@@ -22,7 +22,7 @@
 
 #include <qbuttongroup.h>
 #include <qradiobutton.h>
-#include <iostream.h>
+#include <iostream>
 #include "keyoffs.h"
 #include "resource.h"
 #include "keysig.h"
Index: noteedit-2.8.1/noteedit/musicxmlimport.h
===================================================================
--- noteedit-2.8.1.orig/noteedit/musicxmlimport.h
+++ noteedit-2.8.1/noteedit/musicxmlimport.h
@@ -126,7 +126,7 @@ private:
 	void handlePedal(NChord * chord);
 	void handleTuplet(NMusElement * elem);
 	void handleVoice(int staff, int voice);
-	void handleVoiceDoStaff(int staff, int voice, NStaff * & staff, bool & mapped);
+	void handleVoiceDoStaff(int staff_nr, int voice, NStaff * & staff, bool & mapped);
 	int current_max_voice_nr; /* the maximum voice number reached until now */
 	void handleWords();
 	void initStAttributes();
Index: noteedit-2.8.1/noteedit/midimapper.cpp
===================================================================
--- noteedit-2.8.1.orig/noteedit/midimapper.cpp
+++ noteedit-2.8.1/noteedit/midimapper.cpp
@@ -29,9 +29,9 @@
 #endif
 #else
 #ifndef WITH_TSE3
-#include <iostream.h>
+#include <iostream>
 #else
-#include <istream.h>
+#include <istream>
 #endif
 #endif
 #include <unistd.h>
Index: noteedit-2.8.1/noteedit/musicxmlcommon.cpp
===================================================================
--- noteedit-2.8.1.orig/noteedit/musicxmlcommon.cpp
+++ noteedit-2.8.1/noteedit/musicxmlcommon.cpp
@@ -26,7 +26,7 @@
 #if GCC_MAJ_VERS > 2
 #include <iostream>
 #else
-#include <iostream.h>
+#include <iostream>
 #endif
 using namespace std;
 
Index: noteedit-2.8.1/noteedit/musicxmlexport.cpp
===================================================================
--- noteedit-2.8.1.orig/noteedit/musicxmlexport.cpp
+++ noteedit-2.8.1/noteedit/musicxmlexport.cpp
@@ -94,7 +94,7 @@ Note shapes: body as cross, alternative 
 #if GCC_MAJ_VERS > 2
 #include <iostream>
 #else
-#include <iostream.h>
+#include <iostream>
 #endif
 #include <qstring.h>
 #include <qregexp.h>
Index: noteedit-2.8.1/noteedit/musicxmlimport.cpp
===================================================================
--- noteedit-2.8.1.orig/noteedit/musicxmlimport.cpp
+++ noteedit-2.8.1/noteedit/musicxmlimport.cpp
@@ -129,7 +129,7 @@ Note shapes: body as cross, alternative 
 #if GCC_MAJ_VERS > 2
 #include <iostream>
 #else
-#include <iostream.h>
+#include <iostream>
 #endif
 using namespace std;
 
Index: noteedit-2.8.1/noteedit/musixtex.cpp
===================================================================
--- noteedit-2.8.1.orig/noteedit/musixtex.cpp
+++ noteedit-2.8.1/noteedit/musixtex.cpp
@@ -27,7 +27,7 @@
 #include <iostream>
 #include <sstream>
 #else
-#include <iostream.h>
+#include <iostream>
 #include <strstream.h>
 #endif
 #include <stdlib.h> //  esigra: needed for mkstemp when --without-libs
Index: noteedit-2.8.1/noteedit/lilyexport.cpp
===================================================================
--- noteedit-2.8.1.orig/noteedit/lilyexport.cpp
+++ noteedit-2.8.1/noteedit/lilyexport.cpp
@@ -30,7 +30,7 @@
 #if GCC_MAJ_VERS > 2
 #include <istream>
 #else
-#include <istream.h>
+#include <istream>
 #endif
 #include <stdlib.h> //  esigra: needed for mkstemp when --without-libs
 #include <stdio.h>  //  for test only
Index: noteedit-2.8.1/noteedit/main.cpp
===================================================================
--- noteedit-2.8.1.orig/noteedit/main.cpp
+++ noteedit-2.8.1/noteedit/main.cpp
@@ -26,7 +26,7 @@
 #if GCC_MAJ_VERS > 2
 #include <iostream>
 #else
-#include <istream.h>
+#include <istream>
 #endif
 #include <qapplication.h>
 #include <qthread.h>
Index: noteedit-2.8.1/noteedit/multistaffinfo.cpp
===================================================================
--- noteedit-2.8.1.orig/noteedit/multistaffinfo.cpp
+++ noteedit-2.8.1/noteedit/multistaffinfo.cpp
@@ -20,7 +20,7 @@
 /*											*/
 /****************************************************************************************/
 
-#include <istream.h>
+#include <istream>
 #include <cstdlib>
 #include "multistaffinfo.h"
 #include "mainframewidget.h"
Index: noteedit-2.8.1/noteedit/resource.cpp
===================================================================
--- noteedit-2.8.1.orig/noteedit/resource.cpp
+++ noteedit-2.8.1/noteedit/resource.cpp
@@ -26,7 +26,7 @@
 #if GCC_MAJ_VERS > 2
 #include <iostream>
 #else
-#include <istream.h>
+#include <istream>
 #endif
 #include <stdio.h>
 #include <string.h>
Index: noteedit-2.8.1/noteedit/ScoreEditor.cpp
===================================================================
--- noteedit-2.8.1.orig/noteedit/ScoreEditor.cpp
+++ noteedit-2.8.1/noteedit/ScoreEditor.cpp
@@ -23,7 +23,7 @@
 #include "ScoreEditor.h"
 #ifdef ANTHEM_PLUGIN
 #if GCC_MAJ_VERS > 2
-#include <istream.h>
+#include <istream>
 #else
 #include <istream>
 #endif



-- 
gentoo-commits@l.g.o mailing list