rpms/rosegarden4/devel rosegarden-pluginpath.patch, NONE, 1.1 rosegarden-separate-fonts.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 rosegarden4.spec, 1.18, 1.19 sources, 1.7, 1.8 rosegarden-1.5.1-lib64.patch, 1.1, NONE

Orcan Ogetbil oget at fedoraproject.org
Fri Feb 19 05:49:20 UTC 2010 

Author: oget

Update of /cvs/pkgs/rpms/rosegarden4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17092

Modified Files:
	.cvsignore rosegarden4.spec sources 
Added Files:
	rosegarden-pluginpath.patch rosegarden-separate-fonts.patch 
Removed Files:
	rosegarden-1.5.1-lib64.patch 
Log Message:
* Thu Feb 18 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 10.02.1-1
- Update to 10.02.1 (Qt4 version)


rosegarden-pluginpath.patch:
 DSSIPluginFactory.cpp   |    2 +-
 LADSPAPluginFactory.cpp |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE rosegarden-pluginpath.patch ---
diff -rupN rosegarden-10.02.old/src/sound/DSSIPluginFactory.cpp rosegarden-10.02/src/sound/DSSIPluginFactory.cpp
--- rosegarden-10.02.old/src/sound/DSSIPluginFactory.cpp	2010-02-13 20:52:49.000000000 -0500
+++ rosegarden-10.02/src/sound/DSSIPluginFactory.cpp	2010-02-18 23:22:24.000000000 -0500
@@ -234,7 +234,7 @@ DSSIPluginFactory::getPluginPath()
         path = cpath;
 
     if (path == "") {
-        path = "/usr/local/lib/dssi:/usr/lib/dssi";
+        path = "/usr/local/lib64/dssi:/usr/lib64/dssi:/usr/local/lib/dssi:/usr/lib/dssi";
         char *home = getenv("HOME");
         if (home)
             path = std::string(home) + "/.dssi:" + path;
diff -rupN rosegarden-10.02.old/src/sound/LADSPAPluginFactory.cpp rosegarden-10.02/src/sound/LADSPAPluginFactory.cpp
--- rosegarden-10.02.old/src/sound/LADSPAPluginFactory.cpp	2010-02-13 20:52:49.000000000 -0500
+++ rosegarden-10.02/src/sound/LADSPAPluginFactory.cpp	2010-02-18 23:26:30.000000000 -0500
@@ -565,7 +565,7 @@ LADSPAPluginFactory::getPluginPath()
         path = cpath;
 
     if (path == "") {
-        path = "/usr/local/lib/ladspa:/usr/lib/ladspa";
+        path = "/usr/local/lib64/ladspa:/usr/lib64/ladspa:/usr/local/lib/ladspa:/usr/lib/ladspa";
         char *home = getenv("HOME");
         if (home)
             path = std::string(home) + "/.ladspa:" + path;
@@ -759,6 +759,12 @@ LADSPAPluginFactory::generateFallbackCat
             path.push_back(p);
             //	    std::cerr << "LADSPAPluginFactory::generateFallbackCategories: path element " << p << std::endl;
         }
+        else if (pluginPath[i].contains("/lib64/")) {
+            QString p(pluginPath[i]);
+            p.replace("/lib64/", "/share/");
+            path.push_back(p);
+            //	    std::cerr << "LADSPAPluginFactory::generateFallbackCategories: path element " << p << std::endl;
+        }        
         path.push_back(pluginPath[i]);
         //	std::cerr << "LADSPAPluginFactory::generateFallbackCategories: path element " << pluginPath[i] << std::endl;
     }

rosegarden-separate-fonts.patch:
 data/data.qrc                           |    3 ---
 scripts/rebuild-qrc                     |    2 +-
 src/gui/editors/notation/SystemFont.cpp |   15 +++------------
 3 files changed, 4 insertions(+), 16 deletions(-)

--- NEW FILE rosegarden-separate-fonts.patch ---
diff -rupN rosegarden-10.02.old/data/data.qrc rosegarden-10.02/data/data.qrc
--- rosegarden-10.02.old/data/data.qrc	2010-02-13 20:53:39.000000000 -0500
+++ rosegarden-10.02/data/data.qrc	2010-02-17 22:43:22.000000000 -0500
@@ -10,9 +10,6 @@ running:
 DO NOT EDIT THIS FILE BY HAND!  All changes will be LOST!
 -->
 <qresource>
-<file>./fonts/LilyPond-feta-design20.pfa</file>
-<file>./fonts/LilyPond-feta-nummer-design10.pfa</file>
-<file>./fonts/LilyPond-parmesan-design20.pfa</file>
 <file>./pixmaps/icons/audio-nok.png</file>
 <file>./pixmaps/icons/audio-ok.png</file>
 <file>./pixmaps/icons/midi-nok.png</file>
diff -rupN rosegarden-10.02.old/scripts/rebuild-qrc rosegarden-10.02/scripts/rebuild-qrc
--- rosegarden-10.02.old/scripts/rebuild-qrc	2010-02-13 20:52:50.000000000 -0500
+++ rosegarden-10.02/scripts/rebuild-qrc	2010-02-17 22:09:46.000000000 -0500
@@ -60,7 +60,7 @@ DO NOT EDIT THIS FILE BY HAND!  All chan
 <qresource>
 EOF
 
-for ext in pfa png ts qss rc rg rgd rgp rgt xml xpm; do
+for ext in png ts qss rc rg rgd rgp rgt xml xpm; do
     writeEntries $ext
 done
 
diff -rupN rosegarden-10.02.old/src/gui/editors/notation/SystemFont.cpp rosegarden-10.02/src/gui/editors/notation/SystemFont.cpp
--- rosegarden-10.02.old/src/gui/editors/notation/SystemFont.cpp	2010-02-13 20:52:47.000000000 -0500
+++ rosegarden-10.02/src/gui/editors/notation/SystemFont.cpp	2010-02-17 23:38:26.000000000 -0500
@@ -166,24 +166,15 @@ void
 SystemFont::unbundleFonts()
 {
     QStringList fontFiles;
-    fontFiles << ResourceFinder().getResourceFiles("fonts", "pfa");
-    fontFiles << ResourceFinder().getResourceFiles("fonts", "pfb");
-    fontFiles << ResourceFinder().getResourceFiles("fonts", "ttf");
-    fontFiles << ResourceFinder().getResourceFiles("fonts", "otf");
+    fontFiles << QString("/usr/share/fonts/rosegarden4/LilyPond-feta-design20.pfa");
+    fontFiles << QString("/usr/share/fonts/rosegarden4/LilyPond-feta-nummer-design10.pfa");
+    fontFiles << QString("/usr/share/fonts/rosegarden4/LilyPond-parmesan-design20.pfa");
 
     NOTATION_DEBUG << "Found font files: " << fontFiles << endl;
 
     for (QStringList::const_iterator i = fontFiles.begin();
          i != fontFiles.end(); ++i) {
         QString fontFile(*i);
-        QString name = QFileInfo(fontFile).fileName();
-        if (fontFile.startsWith(":")) {
-            ResourceFinder().unbundleResource("fonts", name);
-            fontFile = ResourceFinder().getResourcePath("fonts", name);
-            if (fontFile.startsWith(":")) { // unbundling failed
-                continue;
-            }
-        }
         addFont(fontFile);
     }
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rosegarden4/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	6 Mar 2009 23:47:30 -0000	1.7
+++ .cvsignore	19 Feb 2010 05:49:20 -0000	1.8
@@ -1 +1 @@
-rosegarden-1.7.3.tar.bz2
+rosegarden-10.02.1.tar.bz2


Index: rosegarden4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rosegarden4/devel/rosegarden4.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- rosegarden4.spec	14 Feb 2010 00:00:27 -0000	1.18
+++ rosegarden4.spec	19 Feb 2010 05:49:20 -0000	1.19
@@ -1,32 +1,36 @@
-Name:      rosegarden4
-Version:   1.7.3
-Release:   6%{?dist}
-Summary:   MIDI, audio and notation editor
-Group:     Applications/Multimedia
-License:   GPLv2+
-URL:       http://www.rosegardenmusic.com/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: http://downloads.sourceforge.net/sourceforge/rosegarden/rosegarden-%{version}.tar.bz2
-Patch2:  rosegarden-1.5.1-lib64.patch
+Name:          rosegarden4
+Version:       10.02.1
+Release:       1%{?dist}
+Summary:       MIDI, audio and notation editor
+Group:         Applications/Multimedia
+License:       GPLv2+
+URL:           http://www.rosegardenmusic.com/
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:       http://downloads.sourceforge.net/project/rosegarden/rosegarden/10.02/rosegarden-%{version}.tar.bz2
+# Fedora doesn't want fonts built into the final binary
+Patch0:        rosegarden-separate-fonts.patch
+# Look for LADSPA/DSSI plugins in the correct place on 64bit platforms 
+Patch1:        rosegarden-pluginpath.patch
 
-BuildRequires: cmake
-BuildRequires: gettext
+BuildRequires: alsa-lib-devel
 BuildRequires: desktop-file-utils
-BuildRequires: kdelibs3-devel
+BuildRequires: dssi-devel
 BuildRequires: fftw-devel
+BuildRequires: fontpackages-devel
+BuildRequires: imake
 BuildRequires: jack-audio-connection-kit-devel
-BuildRequires: liblo-devel
+BuildRequires: kdelibs4-devel
 BuildRequires: ladspa-devel
+BuildRequires: liblo-devel
 BuildRequires: liblrdf-devel
-BuildRequires: dssi-devel
+BuildRequires: libsamplerate-devel
+BuildRequires: libsndfile-devel
 BuildRequires: lirc-devel
-BuildRequires: fontpackages-devel
 
-Requires: kdebase
-Requires: perl-XML-Twig
-Requires: %{name}-feta-fonts = %{version}-%{release}
-Requires: %{name}-parmesan-fonts = %{version}-%{release}
+Provides:      rosegarden = %{version}-%{release}
+
+Requires:      %{name}-feta-fonts = %{version}-%{release}
+Requires:      %{name}-parmesan-fonts = %{version}-%{release}
 
 %description
 Rosegarden is a professional audio and MIDI sequencer, score editor, and
@@ -36,10 +40,10 @@ Rosegarden is an easy to learn, attracti
 musicians, music students, and small studio or home recording environments. 
 
 %package feta-fonts
-Summary:  Rosegarden feta fonts
-Group:    User Interface/X
-BuildArch: noarch
-Requires: fontpackages-filesystem
+Summary:       Rosegarden feta fonts
+Group:         User Interface/X
+BuildArch:     noarch
+Requires:      fontpackages-filesystem
 
 %description feta-fonts
 Rosegarden is a professional audio and MIDI sequencer, score editor, and
@@ -49,10 +53,10 @@ This package contains Lilypond's feta mu
 of Rosegarden.
 
 %package parmesan-fonts
-Summary:  Rosegarden parmesan fonts
-Group:    User Interface/X
-BuildArch: noarch
-Requires: fontpackages-filesystem
+Summary:       Rosegarden parmesan fonts
+Group:         User Interface/X
+BuildArch:     noarch
+Requires:      fontpackages-filesystem
 
 %description parmesan-fonts
 Rosegarden is a professional audio and MIDI sequencer, score editor, and
@@ -63,33 +67,31 @@ use of Rosegarden.
 
 %prep
 %setup -q -n rosegarden-%{version}
-# Look for LADSPA/DSSI plugins in the correct place on 64bit platforms 
-%if "%{_lib}" == "lib64"
-%patch2 -p1
-%endif
+%patch0 -p1 -b .fonts
+%patch1 -p1 -b .pluginpath
 
 # Fix permissions:
 chmod 644 src/commands/segment/SegmentSplitTwiceCommand.*
+chmod 644 src/gui/widgets/BaseTextFloat.*
 
 # Add GenericName to the desktop file:
 echo "GenericName=Audio and MIDI Sequencer" >> data/desktop/rosegarden.desktop
 
-# Put quotes around this item, otherwise the script will fail. RHBZ#464046
-sed -i 's|\(`send_dcop wasCancelled`\)|"\1"|' src/helpers/rosegarden-lilypondview
-
-# Fix DSO linking
-sed -i 's|\(kdeui\)|\1 DCOP kdefx|' src/CMakeLists.txt
+# To force our Fedora flags
+sed -i 's|@CXXFLAGS@|%optflags|' Makefile.in
 
 %build
-%cmake . -DCMAKE_CXX_FLAGS="%{optflags}"
-make VERBOSE=1 %{?_smp_mflags}
+# The following is needed if kdelibs3 is installed
+#unset QTDIR
+# Fix DSO linking
+export LIBS="-lz -lX11 -ldl"
+%configure
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
-mv %{buildroot}%{_datadir}/applications/kde/rosegarden.desktop \
-   %{buildroot}%{_datadir}/applications/
 
 desktop-file-install --vendor fedora \
   --dir %{buildroot}%{_datadir}/applications \
@@ -98,19 +100,10 @@ desktop-file-install --vendor fedora \
   --remove-category X-Red-Hat-Base \
   %{buildroot}%{_datadir}/applications/rosegarden.desktop
 
-%find_lang rosegarden
-
-# Install fonts in the %%_fontdir and create symlinks
+# Install fonts in the %%_fontdir
 mkdir -p %{buildroot}/%{_fontdir}
 install -pm 644 data/fonts/*.pfa %{buildroot}/%{_fontdir}
-pushd %{buildroot}%{_datadir}/apps/rosegarden/fonts/
-   for pfafile in *.pfa ; do
-      ln -sf ../../../fonts/%{name}/$pfafile .
-   done
-popd
 
-%check
-#ctest
 
 %clean
 rm -rf %{buildroot}
@@ -132,33 +125,14 @@ fi
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
-%files -f rosegarden.lang
+%files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING
+%doc AUTHORS COPYING CONTRIBUTING README
 %{_bindir}/rosegarden
-%{_bindir}/rosegarden-audiofile-importer
-%{_bindir}/rosegarden-lilypondview
-%{_bindir}/rosegarden-project-package
-%{_bindir}/rosegardensequencer
 %{_datadir}/applications/fedora-rosegarden.desktop
-%{_datadir}/apps/profiles/rosegarden.profile.xml
-%{_datadir}/apps/rosegarden/
-%{_docdir}/HTML/*/rosegarden/
-%{_datadir}/icons/hicolor/16x16/apps/rosegarden.png
-%{_datadir}/icons/hicolor/16x16/mimetypes/x-rosegarden.png
+%{_datadir}/icons/hicolor/*/mimetypes/audio-x-rosegarden-*.png
 %{_datadir}/icons/hicolor/32x32/apps/rosegarden.png
-%{_datadir}/icons/hicolor/32x32/mimetypes/x-rosegarden.png
-%{_datadir}/icons/hicolor/48x48/apps/rosegarden.png
-%{_datadir}/icons/hicolor/64x64/apps/rosegarden.png
-%{_datadir}/icons/hicolor/128x128/apps/rosegarden.png
-%{_datadir}/icons/locolor/16x16/apps/rosegarden.xpm
-%{_datadir}/icons/locolor/16x16/mimetypes/x-rosegarden.png
-%{_datadir}/icons/locolor/32x32/apps/rosegarden.xpm
-%{_datadir}/icons/locolor/32x32/mimetypes/x-rosegarden.png
-%{_datadir}/mimelnk/audio/x-rosegarden21.desktop
-%{_datadir}/mimelnk/audio/x-rosegarden.desktop
-%{_datadir}/mimelnk/audio/x-rosegarden-device.desktop
-%{_datadir}/mimelnk/audio/x-soundfont.desktop
+%{_datadir}/mime/packages/rosegarden.xml
 
 %_font_pkg -n feta *feta*.pfa
 %doc data/fonts/README
@@ -167,6 +141,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %doc data/fonts/README
 
 %changelog
+* Thu Feb 18 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 10.02.1-1
+- Update to 10.02.1 (Qt4 version)
+
 * Sat Feb 13 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.7.3-6
 - Fix DSO linking RHBZ#564747
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rosegarden4/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	6 Mar 2009 23:47:30 -0000	1.7
+++ sources	19 Feb 2010 05:49:20 -0000	1.8
@@ -1 +1 @@
-122eab42e375d2f3b009c8540ae8069c  rosegarden-1.7.3.tar.bz2
+1f5ccf2df85850e51b378388303be67d  rosegarden-10.02.1.tar.bz2


--- rosegarden-1.5.1-lib64.patch DELETED ---

More information about the scm-commits mailing list