[kaffeine/el6] Rebuild for Fedora EPEL 6 (#1036442)

Robert Scheck robert at fedoraproject.org
Mon Dec 2 20:25:56 UTC 2013 

commit 6891213ff8bc6d5af76dec33747d06919ee3c309
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Dec 2 21:25:41 2013 +0100

    Rebuild for Fedora EPEL 6 (#1036442)

 .gitignore                                   |    2 +-
 kaffeine-1.0-pre3-deinterlace-optional.patch |   91 --------------------
 kaffeine-1.0-pre3-mkfifo.patch.patch         |   11 ---
 kaffeine-1.2.2-gcc47.patch                   |   32 +++++++
 kaffeine-1.2.2-kstatusnotifieritem.patch     |   45 ++++++++++
 kaffeine.spec                                |  116 ++++++++++++++++++++------
 sources                                      |    2 +-
 7 files changed, 171 insertions(+), 128 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4436234..c00f1eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-kaffeine-1.0-pre3.tar.gz
+/kaffeine-1.?.?.tar.gz
diff --git a/kaffeine-1.2.2-gcc47.patch b/kaffeine-1.2.2-gcc47.patch
new file mode 100644
index 0000000..e74563e
--- /dev/null
+++ b/kaffeine-1.2.2-gcc47.patch
@@ -0,0 +1,32 @@
+commit 2da9df1e67004c3cfa879578c351300a99f23da1
+Author: Christoph Pfister <christophpfister at gmail.com>
+Date:   Wed Apr 4 21:22:09 2012 +0200
+
+    fix build for gcc 4.7
+
+diff --git a/src/dvb/dvbepg.cpp b/src/dvb/dvbepg.cpp
+index 7fc8f68..e70d8b8 100644
+--- a/src/dvb/dvbepg.cpp
++++ b/src/dvb/dvbepg.cpp
+@@ -690,15 +690,15 @@ void AtscEpgFilter::processEitSection(const char *data, int size)
+ 	// 1980-01-06T000000 minus 15 secs (= UTC - GPS in 2011)
+ 	QDateTime baseDateTime = QDateTime(QDate(1980, 1, 5), QTime(23, 59, 45), Qt::UTC);
+ 
+-	for (AtscEitSectionEntry entry = eitSection.entries(); (entryCount > 0) && entry.isValid();
+-	     --entryCount, entry.advance()) {
++	for (AtscEitSectionEntry eitEntry = eitSection.entries();
++	     (entryCount > 0) && eitEntry.isValid(); --entryCount, eitEntry.advance()) {
+ 		DvbEpgEntry epgEntry;
+ 		epgEntry.channel = channel;
+-		epgEntry.begin = baseDateTime.addSecs(entry.startTime());
+-		epgEntry.duration = QTime().addSecs(entry.duration());
+-		epgEntry.title = entry.title();
++		epgEntry.begin = baseDateTime.addSecs(eitEntry.startTime());
++		epgEntry.duration = QTime().addSecs(eitEntry.duration());
++		epgEntry.title = eitEntry.title();
+ 
+-		quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(entry.eventId()));
++		quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(eitEntry.eventId()));
+ 		DvbSharedEpgEntry entry = epgEntries.value(id);
+ 
+ 		if (entry.isValid() && (entry->channel == epgEntry.channel) &&
diff --git a/kaffeine-1.2.2-kstatusnotifieritem.patch b/kaffeine-1.2.2-kstatusnotifieritem.patch
new file mode 100644
index 0000000..ce04102
--- /dev/null
+++ b/kaffeine-1.2.2-kstatusnotifieritem.patch
@@ -0,0 +1,45 @@
+Patch by Robert Scheck <robert at fedoraproject.org> for kaffeine >= 1.2.2 which replaces the
+KStatusNotifierItem by KNotificationItem in order to build with KDE 4.3 as shipped in Red Hat
+Enterprise Linux 6. KNotificationItem is there provided by the kdelibs-experimental(-devel)
+package.
+
+--- kaffeine-1.2.2/src/mainwindow.cpp				2011-04-17 21:17:19.000000000 +0200
++++ kaffeine-1.2.2/src/mainwindow.cpp.kstatusnotifieritem	2013-12-02 01:23:00.337539523 +0100
+@@ -35,7 +35,8 @@
+ #include <KMenuBar>
+ #include <KRecentFilesAction>
+ #include <KShortcutsDialog>
+-#include <KStatusNotifierItem>
++#include <knotificationitem-1/knotificationitem.h>
++using ::Experimental::KNotificationItem;
+ #include <KTabBar>
+ #include <KToolBar>
+ #include "dvb/dvbtab.h"
+@@ -424,9 +425,9 @@
+ 	// workaround setAutoSaveSettings() which doesn't accept "IconOnly" as initial state
+ 	controlBar->setToolButtonStyle(Qt::ToolButtonIconOnly);
+ 
+-	KStatusNotifierItem *trayIcon = new KStatusNotifierItem(this);
++	KNotificationItem *trayIcon = new KNotificationItem(this);
+ 	trayIcon->setIconByName("kaffeine");
+-	trayIcon->setStatus(KStatusNotifierItem::Active);
++	trayIcon->setStatus(KNotificationItem::Active);
+ 	trayIcon->setToolTipIconByName("kaffeine");
+ 	trayIcon->setToolTipTitle(i18n("Kaffeine"));
+ 
+--- kaffeine-1.2.2/src/CMakeLists.txt				2011-04-17 21:17:19.000000000 +0200
++++ kaffeine-1.2.2/src/CMakeLists.txt.kstatusnotifieritem	2013-12-02 01:32:04.820702013 +0100
+@@ -41,11 +41,11 @@
+ configure_file(config-kaffeine.h.cmake ${CMAKE_BINARY_DIR}/config-kaffeine.h)
+ 
+ kde4_add_executable(kaffeine ${kaffeinedvb_SRCS} ${kaffeine_SRCS})
+-target_link_libraries(kaffeine ${QT_QTSQL_LIBRARY} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS} ${X11_Xscreensaver_LIB})
++target_link_libraries(kaffeine ${QT_QTSQL_LIBRARY} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS} ${X11_Xscreensaver_LIB} knotificationitem-1)
+ install(TARGETS kaffeine ${INSTALL_TARGETS_DEFAULT_ARGS})
+ install(FILES scanfile.dvb DESTINATION ${DATA_INSTALL_DIR}/kaffeine)
+ install(PROGRAMS kaffeine.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+ 
+ kde4_add_executable(kaffeine-xbu ${kaffeinexbu_SRCS})
+-target_link_libraries(kaffeine-xbu ${X11_X11_LIB} ${XINE_LIBRARY} ${KDE4_KDEUI_LIBS})
++target_link_libraries(kaffeine-xbu ${X11_X11_LIB} ${XINE_LIBRARY} ${KDE4_KDEUI_LIBS} knotificationitem-1)
+ install(TARGETS kaffeine-xbu ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/kaffeine.spec b/kaffeine.spec
index 3132124..abeb30e 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,40 +1,49 @@
-
-%define pre pre3
-
 Name:    kaffeine
-Version: 1.0 
-Release: 0.5.%{pre}%{?dist}
+Version: 1.2.2
+Release: 8%{?dist}
 
 License: GPLv2+
 Summary: KDE media player
 Group:   Applications/Multimedia
 URL:     http://kaffeine.kde.org/
-Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}%{?pre:-%{pre}}.tar.gz
+Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstreamable patches
-Patch50: kaffeine-1.0-pre3-mkfifo.patch.patch
-Patch60: kaffeine-1.0-pre3-deinterlace-optional.patch
+## EPEL-only patches
+# work around missing KStatusNotifierItem in KDE 4.3.4 of RHEL/CentOS 6
+Patch0: kaffeine-1.2.2-kstatusnotifieritem.patch
+
+## upstream patches
+# fix build with g++ 4.7 (Christoph Pfister)
+# http://commits.kde.org/kaffeine/2da9df1e67004c3cfa879578c351300a99f23da1
+Patch100: kaffeine-1.2.2-gcc47.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: kdelibs4-devel
-BuildRequires: xine-lib-devel
+BuildRequires: xine-lib-devel libXScrnSaver-devel
+%if 0%{?rhel} < 7
+BuildRequires: kdelibs-experimental-devel
+%endif
 
 Obsoletes: kaffeine-libs < 1.0
 Obsoletes: kaffeine-devel < 1.0
 
-%{?_kde4_version:Requires: kdelibs4 >= %{_kde4_vesion}}
+Requires: kdebase-runtime
+
+%{?_kde4_version:Requires: kdelibs4 >= %{_kde4_version}}
 
 %description
 Kaffeine is a KDE media player.
 
 
 %prep
-%setup -q -n kaffeine-%{version}%{?pre:-%{pre}}
+%setup -q -n kaffeine-%{version}
+%if 0%{?rhel} < 7
+%patch0 -p1 -b .kstatusnotifieritem
+%endif
+%patch100 -p1 -b .gcc47
 
-%patch50 -p1 -b .mkfifo
-%patch60 -p1
 
 %build
 mkdir -p %{_target_platform}
@@ -50,9 +59,6 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-mv %{buildroot}%{_kde4_iconsdir}/oxygen \
-   %{buildroot}%{_kde4_iconsdir}/hicolor
-
 %find_lang %{name} --with-kde
 
 
@@ -65,35 +71,97 @@ rm -rf %{buildroot}
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &>/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
   update-desktop-database %{_datadir}/applications &>/dev/null
-  touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-  gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+  touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
 fi
 
 %posttrans
 update-desktop-database %{_datadir}/applications &>/dev/null
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING TODO
+%doc COPYING README
 %{_kde4_bindir}/kaffeine
 %{_kde4_bindir}/kaffeine-xbu
 %{_kde4_appsdir}/kaffeine/
 %{_kde4_appsdir}/solid/actions/*.desktop
 %{_kde4_datadir}/applications/kde4/kaffeine.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_libdir}/kde4/kaffeinedvb.so
+%{_kde4_iconsdir}/oxygen/*/*/*
+%{_kde4_appsdir}/profiles/kaffeine.profile.xml
 
 
 %changelog
+* Mon Dec 02 2013 Robert Scheck <robert at fedoraproject.org> 1.2.2-8
+- Rebuild for Fedora EPEL 6 (#1036442)
+
+* Wed Oct 23 2013 Xavier Bachelot <xavier at bachelot.org> - 1.2.2-7
+- Rebuild for xine-lib 1.2.
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Apr 21 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.2.2-3
+- backport upstream patch to fix FTBFS with g++ 4.7
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon May 09 2011 Rex Dieter <rdieter at fedoraproject.org> 1.2.2-1
+- 1.2.2
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Sep 06 2010 Thomas Janssen <thomasj at fedoraproject.org> 1.1-1
+- kaffeine 1.1
+- fixes #618718
+
+* Tue Aug 17 2010 Thomas Janssen <thomasj at fedoraproject.org> 1.0-7
+- reverted to source
+
+* Tue Aug 17 2010 Thomas Janssen <thomasj at fedoraproject.org> 1.0-6
+- use ln now to have a kaffeine icon in hicolor
+- working with upstream to get it fixed
+- fixes #611273
+
+* Sun Jul 04 2010 Thomas Janssen <thomasj at fedoraproject.org> 1.0-5
+- changed Requires to kdebase-runtime
+- added kaffeine.png to fix #611273
+
+* Sun Jul 04 2010 Thomas Janssen <thomasj at fedoraproject.org> 1.0-4
+- added Requires oxygen-icon-theme
+
+* Mon Jun 21 2010 Rex Dieter <rdieter at fedoraproject.org> 1.0-3
+- Unexpanded macro in kdelibs4 dependency (#606134)
+- remove old/unused patches
+
+* Tue Jun 01 2010 Thomas Janssen <thomasj at fedoraproject.org> 1.0-2
+- removed Require libXss, added BR libXss-devel
+
+* Tue Jun 01 2010 Thomas Janssen <thomasj at fedoraproject.org> 1.0-1
+- kaffeine 1.0
+- new dep libXss
+- lots of improvements and bugfixes
+
 * Thu Apr 15 2010 Thomas Janssen <thomasj at fedoraproject.org> 1.0-0.5.pre3
-- added kaffeine-1.0-pre3-deinterlace-optional.patch thanks to Kevin Kofler
+- deinterlace-optional patch thanks to Kevin Kofler
 
 * Mon Feb 08 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.0-0.4.pre3
 - kaffeine-1.0-pre3
diff --git a/sources b/sources
index d407339..5a867c7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-919e29a95b599db5eef74b5983f135f4  kaffeine-1.0-pre3.tar.gz
+690e48d2e5fe123887109aa9b1bc1c31  kaffeine-1.2.2.tar.gz

More information about the scm-commits mailing list