[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#877627: marked as done (stretch-pu: package kde-gtk-config/5.8.6-1+deb9u1)

Your message dated Sat, 09 Dec 2017 10:46:36 +0000
with message-id <1512816396.1994.30.camel@adam-barratt.org.uk>
and subject line Closing bugs for updates included in stretch point release
has caused the Debian Bug report #877627,
regarding stretch-pu: package kde-gtk-config/5.8.6-1+deb9u1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
877627: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=877627
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian.org@packages.debian.org
Usertags: pu
X-Debbugs-CC: debian-qt-kde@lists.debian.org


Dear release team,

I would like to push a fix for src:kde-gtk-config package in stable. Without
this fix package kde-config-gtk-style lacks one very convenient feature
(previewing GTK+ 2.x and GTK+ 3.x themes before applying them) and package
kde-config-gtk-style-preview is absolutely useless (because binaries from it
cannot be used).

Proposed changes have been applied in package in unstable since 04 Aug 2017
(kde-gtk-config/4:5.10.4-1) and all works fine.

Please consider accepting this as a stretch-pu.

Thanks,
Boris

diff -Nru kde-gtk-config-5.8.6/debian/changelog kde-gtk-config-5.8.6/debian/changelog
--- kde-gtk-config-5.8.6/debian/changelog	2017-03-14 17:23:29.000000000 +0300
+++ kde-gtk-config-5.8.6/debian/changelog	2017-10-03 17:31:46.000000000 +0300
@@ -1,3 +1,15 @@
+kde-gtk-config (4:5.8.6-1+deb9u1) stable; urgency=medium
+
+  * Update debian/rules:
+    set DATA_INSTALL_DIR variable in configuration options: it is required
+    for correct search of preview.ui file in gtk*_preview programs.
+    (These programs have not been working since version 4:5.1.95-0ubuntu1)
+  * Add patch fix-search-of-gtk-preview-executables.
+    It is required for showing preview buttons in KDE-GTK-config UI.
+    (These buttons have not been working since version 4:5.1.95-0ubuntu1)
+
+ -- Boris Pek <tehnick@debian.org>  Tue, 03 Oct 2017 17:31:46 +0300
+
 kde-gtk-config (4:5.8.6-1) unstable; urgency=medium
 
   * New upstream release (5.8.6)
diff -Nru kde-gtk-config-5.8.6/debian/patches/fix-search-of-gtk-preview-executables.patch kde-gtk-config-5.8.6/debian/patches/fix-search-of-gtk-preview-executables.patch
--- kde-gtk-config-5.8.6/debian/patches/fix-search-of-gtk-preview-executables.patch	1970-01-01 03:00:00.000000000 +0300
+++ kde-gtk-config-5.8.6/debian/patches/fix-search-of-gtk-preview-executables.patch	2017-08-04 17:00:50.000000000 +0300
@@ -0,0 +1,43 @@
+Forwarded: no
+Description: Fix search of gtk*_preview executables
+ Due to Debian multiarch support gtk_preview and gtk3_preview executables are
+ installed into non-standard path (/usr/lib/*/libexec/) which is out of
+ search scope of QStandardPaths::findExecutable() function.
+ .
+ This patch is required for showing preview buttons in KDE-GTK-config UI.
+Author: Boris Pek <tehnick-8@yandex.ru>
+Last-Update: 2017-08-04
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,6 +26,8 @@
+ 
+ # Set KI18n translation domain
+ add_definitions(-DTRANSLATION_DOMAIN=\"kde-gtk-config\")
++add_definitions(-DCMAKE_INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\")
++add_definitions(-DLIBEXEC_INSTALL_DIR=\"${LIBEXEC_INSTALL_DIR}\")
+ 
+ set(kcm_SRCS
+      src/iconthemesmodel.cpp
+diff --git a/src/gtkconfigkcmodule.cpp b/src/gtkconfigkcmodule.cpp
+--- a/src/gtkconfigkcmodule.cpp
++++ b/src/gtkconfigkcmodule.cpp
+@@ -87,6 +87,17 @@
+     QString gtk2Preview = QStandardPaths::findExecutable("gtk_preview");
+     QString gtk3Preview = QStandardPaths::findExecutable("gtk3_preview");
+     
++    // KStandardDirs::findExe was replaced by QStandardPaths::findExecutable
++    // in a wrong way. See for details:
++    // https://community.kde.org/Frameworks/Porting_Notes/KStandardDirs
++    static const QString searchPath = CMAKE_INSTALL_PREFIX "/" LIBEXEC_INSTALL_DIR;
++    if(gtk2Preview.isEmpty()) {
++        gtk2Preview = QStandardPaths::findExecutable("gtk_preview", QStringList() << searchPath);
++    }
++    if(gtk3Preview.isEmpty()) {
++        gtk3Preview = QStandardPaths::findExecutable("gtk3_preview", QStringList() << searchPath);
++    }
++    
+     m_p2 = new KProcess(this);
+     m_p2->setEnv("GTK2_RC_FILES", m_tempGtk2Preview, true);
+     if(!gtk2Preview.isEmpty()) {
diff -Nru kde-gtk-config-5.8.6/debian/patches/series kde-gtk-config-5.8.6/debian/patches/series
--- kde-gtk-config-5.8.6/debian/patches/series	1970-01-01 03:00:00.000000000 +0300
+++ kde-gtk-config-5.8.6/debian/patches/series	2017-08-04 17:00:50.000000000 +0300
@@ -0,0 +1 @@
+fix-search-of-gtk-preview-executables.patch
diff -Nru kde-gtk-config-5.8.6/debian/rules kde-gtk-config-5.8.6/debian/rules
--- kde-gtk-config-5.8.6/debian/rules	2017-03-14 17:23:29.000000000 +0300
+++ kde-gtk-config-5.8.6/debian/rules	2017-10-03 17:29:35.000000000 +0300
@@ -2,6 +2,9 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
+override_dh_auto_configure:
+	dh_auto_configure -- -DDATA_INSTALL_DIR="/usr/share/"
+
 override_dh_auto_test:
 	# Disable dh_auto_test at build time
 	:

--- End Message ---
--- Begin Message --- 
Version: 9.3

Hi,

Each of the updates referenced in these bugs was included in this
morning's stretch point release. Thanks!

Regards,

Adam

--- End Message ---
Reply to: