Hello community, here is the log from the commit of package kaffeine for openSUSE:Factory checked in at 2017-06-12 15:33:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kaffeine (Old) and /work/SRC/openSUSE:Factory/.kaffeine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kaffeine" Mon Jun 12 15:33:11 2017 rev:65 rq:502512 version:2.0.9 Changes: -------- --- /work/SRC/openSUSE:Factory/kaffeine/kaffeine.changes 2017-03-13 15:35:09.180120129 +0100 +++ /work/SRC/openSUSE:Factory/.kaffeine.new/kaffeine.changes 2017-06-12 15:33:14.457512835 +0200 @@ -1,0 +2,10 @@ +Sun Jun 4 07:18:47 UTC 2017 - [email protected] + +- Update to 2.0.9: + * Fix build at tarball +- Drop fix-building-from-tarball.patch, included upstream +- Add remove-stray-call-to-ki18n_install.patch to fix build with + the latest KDE Frameworks in Factory +- Enable DVB support on Leap 42.3 too, v4l-utils are recent enough + +------------------------------------------------------------------- Old: ---- fix-building-from-tarball.patch kaffeine-2.0.8.tar.xz New: ---- kaffeine-2.0.9.tar.xz remove-stray-call-to-ki18n_install.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kaffeine.spec ++++++ --- /var/tmp/diff_new_pack.35lbIM/_old 2017-06-12 15:33:16.409237565 +0200 +++ /var/tmp/diff_new_pack.35lbIM/_new 2017-06-12 15:33:16.413237001 +0200 @@ -20,14 +20,14 @@ Summary: VLC-based Multimedia Player License: GPL-2.0+ Group: Productivity/Multimedia/Video/Players -Version: 2.0.8 +Version: 2.0.9 Release: 0 Url: http://kaffeine.kde.org/ Source0: %{name}-%{version}.tar.xz # PATCH-FEATURE-OPENSUSE kaffeine-fixsplitter.patch -- GUI improvement (allow more flexibly set splitters) Patch0: kaffeine-fixsplitter.patch -# PATCH-FIX-UPSTREAM fix-building-from-tarball.patch -- allow kaffeine to be built from the released tarball -Patch1: fix-building-from-tarball.patch +# PATCH-FIX-OPENSUSE remove-stray-call-to-ki18n_install.patch -- fixes the build with KDE Frameworks 5.34 +Patch1: remove-stray-call-to-ki18n_install.patch Recommends: %{name}-lang = %version Requires: libQt5Sql5-sqlite Requires: vlc-noX @@ -45,7 +45,7 @@ BuildRequires: cmake(KF5Solid) BuildRequires: cmake(KF5WidgetsAddons) BuildRequires: cmake(KF5XmlGui) -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?sle_version} >= 120300) BuildRequires: pkgconfig(libdvbv5) %endif BuildRequires: pkgconfig(Qt5Core) ++++++ kaffeine-2.0.8.tar.xz -> kaffeine-2.0.9.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kaffeine-2.0.8/CMakeLists.txt new/kaffeine-2.0.9/CMakeLists.txt --- old/kaffeine-2.0.8/CMakeLists.txt 2017-03-06 10:57:55.000000000 +0100 +++ new/kaffeine-2.0.9/CMakeLists.txt 2017-03-08 18:54:14.000000000 +0100 @@ -2,7 +2,7 @@ set(KAFFEINE_MAJOR_VERSION 2) set(KAFFEINE_MINOR_VERSION 0) -set(KAFFEINE_PATCH_VERSION 8) +set(KAFFEINE_PATCH_VERSION 9) # comment/uuncomment below if either the version is a production or a development one #set(KAFFEINE_EXTRA_VERSION -git) @@ -93,7 +93,11 @@ add_subdirectory(profiles) add_subdirectory(src) if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") - add_subdirectory(po) + if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/po/CMakeLists.txt" ) + add_subdirectory(po) + else() + ki18n_install(po) + endif() endif() if(KF5DocTools_VERSION) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kaffeine-2.0.8/po/it/kaffeine.po new/kaffeine-2.0.9/po/it/kaffeine.po --- old/kaffeine-2.0.8/po/it/kaffeine.po 2017-03-06 10:55:59.000000000 +0100 +++ new/kaffeine-2.0.9/po/it/kaffeine.po 2017-03-08 18:52:16.000000000 +0100 @@ -7,7 +7,7 @@ "Project-Id-Version: kaffeine\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-03-02 03:49+0100\n" -"PO-Revision-Date: 2017-02-18 08:42+0100\n" +"PO-Revision-Date: 2017-03-04 22:57+0100\n" "Last-Translator: Vincenzo Reale <[email protected]>\n" "Language-Team: Italian <[email protected]>\n" "Language: it\n" @@ -1772,10 +1772,9 @@ msgstr "Un lettore multimediale per KDE con supporto per la TV digitale." #: main.cpp:135 -#, fuzzy, kde-format -#| msgid "(C) 2007-2016 The Kaffeine Authors" +#, kde-format msgid "(C) 2007-2017 The Kaffeine Authors" -msgstr "(C) 2007-2016 Gli autori di Kaffeine" +msgstr "(C) 2007-2017 Gli autori di Kaffeine" #: main.cpp:153 #, kde-format @@ -1964,6 +1963,11 @@ "QT_LOGGING_RULES=kaffeine.category.debug=true\n" "where 'category' can be:\n" msgstr "" +"Abilita tutti i messaggi di debug. Nota che Kaffeine consente inoltre di " +"abilitare i messaggi di debug per categoria, utilizzando la variabile " +"d'ambiente:\n" +"QT_LOGGING_RULES=kaffeine.categoria.debug=true\n" +"dove 'categoria' può essere:\n" #: mainwindow.cpp:499 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kaffeine-2.0.8/src/dvb/dvbdevice_linux.cpp new/kaffeine-2.0.9/src/dvb/dvbdevice_linux.cpp --- old/kaffeine-2.0.8/src/dvb/dvbdevice_linux.cpp 2017-03-06 10:41:33.000000000 +0100 +++ new/kaffeine-2.0.9/src/dvb/dvbdevice_linux.cpp 2017-03-07 11:12:09.000000000 +0100 @@ -22,23 +22,11 @@ #include "../log.h" extern "C" { - #include <dirent.h> #include <dmx.h> #include <errno.h> #include <fcntl.h> #include <frontend.h> #include <poll.h> - #include <stdlib.h> - #include <sys/syslog.h> - #include <unistd.h> - #include <vector> - #include <sys/socket.h> - #include <sys/un.h> - #include <sys/types.h> - #include <sys/inotify.h> - #include <sys/ioctl.h> - #include <sys/stat.h> - #include <sys/syslog.h> } #include <QFile> @@ -1628,181 +1616,15 @@ } } -struct dvbdev { - time_t stctime; - char checked; - char adapter_name[50]; - char node_name[75]; - int adapternum; - char lnode[20]; -}; - -class DvbDeviceMonitor : public QThread -{ - public: - DvbDeviceMonitor(DvbLinuxDeviceManager *ddm) - { - this->ddm = ddm; - } - ~DvbDeviceMonitor() - { - } - void run() { - DIR *dvbdir, *adapterdirp; - struct dirent *dp, *dp2; - struct stat stbuf; - int adapter; - int rescan=0; - int rv; - int ifd; - int found=0; - char adapterdir[50]; - char nodename[75]; - char buffer[1024]; - struct pollfd pfd; - char firstrun_complete=0; - std::vector<struct dvbdev*>adapterlist; - std::vector<struct dvbdev*>::iterator iter; - - runstate = 1; - - ifd = inotify_init(); - inotify_add_watch(ifd, "/dev/dvb", IN_CREATE|IN_DELETE); - fcntl(ifd, F_SETFL, O_NONBLOCK); - pfd.fd = ifd; - pfd.events = POLLIN; - - while(runstate) { - if (firstrun_complete) { - rv = poll(&pfd, 1, 100); - switch (rv) { - case -1: - break; - case 0: - continue; - default: - usleep(100000); /* give it some time to settle down */ - while(read(ifd, buffer, 1024)>0); - break; - } - } else { - firstrun_complete=1; - } - - dvbdir = opendir("/dev/dvb"); - for (iter=adapterlist.begin();iter!=adapterlist.end();iter++) { - (*iter)->checked=0; - } - if (dvbdir) { - while((dp=readdir(dvbdir))!= 0) { - if (strcmp(dp->d_name, ".") == 0 || - strcmp(dp->d_name, "..") == 0) - continue; - adapter = strtol(&dp->d_name[7], NULL, 10); - sprintf(adapterdir, "/dev/dvb/%s", dp->d_name); - adapterdirp = opendir(adapterdir); - if (adapterdirp) { - while((dp2=readdir(adapterdirp))!=0) { - found=0; - if (strcmp(dp2->d_name, ".")==0 || - strcmp(dp2->d_name, "..")==0) - continue; - sprintf(nodename, "/dev/dvb/%s/%s", dp->d_name, dp2->d_name); - rv = stat(nodename, &stbuf); - for (iter=adapterlist.begin();iter!=adapterlist.end();iter++) { - if (strcmp((*iter)->node_name, nodename)==0 && (*iter)->stctime == stbuf.st_ctime) { - (*iter)->checked=1; - found=1; - break; - } - } - if (found == 0) { - struct dvbdev *dvbdev = (struct dvbdev*)calloc(1, sizeof(struct dvbdev)); - dvbdev->checked=1; - dvbdev->stctime = stbuf.st_ctime; - strcpy(dvbdev->adapter_name, dp->d_name); - strcpy(dvbdev->node_name, nodename); - dvbdev->adapternum = adapter; - strcpy(dvbdev->lnode, dp2->d_name); - adapterlist.push_back(dvbdev); - ddm->componentAdded(dp2->d_name, adapter, 0); - } - - } - closedir(adapterdirp); - } - } - closedir(dvbdir); - } - do { - rescan=0; - for (iter=adapterlist.begin();iter!=adapterlist.end();iter++) { - if ((*iter)->checked==0) { - ddm->componentRemoved((*iter)->lnode, (*iter)->adapternum, 0); - free(*iter); - adapterlist.erase(iter); - rescan=1; - break; - } - } - } while (rescan!=0); - } - } - void stop() { - runstate = 0; - wait(); - } - private: - int runstate; - DvbLinuxDeviceManager *ddm; -}; - -#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun) -#define MACHADDRESS "/tmp/.mediasocket" -#else -#define ADDRESS "/de/sundtek/mediasocket" /* addr to connect */ -#endif - DvbLinuxDeviceManager::DvbLinuxDeviceManager(QObject *parent) : QObject(parent) { - int fd; - int len; - int ret; - struct sockaddr_un saun; QObject *notifier = Solid::DeviceNotifier::instance(); connect(notifier, SIGNAL(deviceAdded(QString)), this, SLOT(componentAdded(QString))); connect(notifier, SIGNAL(deviceRemoved(QString)), this, SLOT(componentRemoved(QString))); - - memset(&saun, 0x0, sizeof(struct sockaddr_un)); - fd = socket(AF_UNIX, SOCK_STREAM, 0); - if (fd==-1) { - monitor = NULL; - return; - } - saun.sun_family = AF_UNIX; -#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun) - strcpy(saun.sun_path, MACHADDRESS); - len = sizeof(saun.sun_family) + strlen(saun.sun_path)+1; -#else - strcpy(&saun.sun_path[1], ADDRESS); - len = sizeof(saun.sun_family) + strlen(&saun.sun_path[1])+1; -#endif - if ((ret=::connect(fd, (struct sockaddr*)&saun, len)) < 0) { - close(fd); - monitor = NULL; - return; - } - close(fd); - qCInfo(logDev, "Starting DvbDeviceMonitor thread"); - - monitor = new DvbDeviceMonitor(this); - monitor->start(); } DvbLinuxDeviceManager::~DvbLinuxDeviceManager() { - if (monitor) - monitor->stop(); } void DvbLinuxDeviceManager::doColdPlug() @@ -1812,51 +1634,6 @@ } } -void -DvbLinuxDeviceManager::componentAdded (QString node, int adapter, int index) -{ - int deviceIndex = (adapter << 16) | index; - char adapterstring[10]; - DvbLinuxDevice *device = devices.value (deviceIndex, NULL); - if (device == NULL) - { - device = new DvbLinuxDevice (this); - devices.insert (deviceIndex, device); - } - sprintf (adapterstring, "adapter%d", adapter); - - if (node == "frontend0") - { - device->frontendPath.sprintf ("/dev/dvb/%s/%s", adapterstring, - node.toStdString().c_str()); - } - else if (node == "dvr0") - { - device->dvrPath.sprintf ("/dev/dvb/%s/%s", adapterstring, - node.toStdString().c_str()); - } - else if (node == "demux0") - { - device->demuxPath.sprintf ("/dev/dvb/%s/%s", adapterstring, - node.toStdString().c_str()); - } - else - { - return; - } - - if (!device->demuxPath.isEmpty () && !device->dvrPath.isEmpty () && - !device->frontendPath.isEmpty ()) - { - device->startDevice (""); - - if (device->isReady ()) - { - emit deviceAdded (device); - } - } -} - void DvbLinuxDeviceManager::componentAdded(const QString &udi) { QRegularExpressionMatch match; ++++++ remove-stray-call-to-ki18n_install.patch ++++++ From: Wolfgang Bauer <[email protected]> Date: Sun, 04 Jun 2017 09:16:09 +0200 Subject: Remove stray/duplicated call to ki18n_install The release script injected an additional ki18n_install(po), but this breaks the build with KDE Frameworks 5.34 (cmake error "another target with the same name already exists") because ki18n_install(po) is already called anyway. So remove it to fix the build. --- diff -u a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,7 +107,5 @@ if(BUILD_TOOLS) add_subdirectory(tools) endif(BUILD_TOOLS) -find_package(KF5I18n CONFIG REQUIRED) -ki18n_install(po) find_package(KF5DocTools CONFIG REQUIRED) kdoctools_install(po)
