r54565 - in /desktop/experimental/gtk+4.0/debian: changelog libgtk-4-0.install.in libgtk-4-common.install.in patches/git_install-printbackends.patch patches/series

jbicha at users.alioth.debian.org jbicha at users.alioth.debian.org
Thu Oct 26 21:27:02 UTC 2017


Author: jbicha
Date: Thu Oct 26 21:27:01 2017
New Revision: 54565

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54565
Log:
Cherry-pick git_install-printbackends.patch

Added:
    desktop/experimental/gtk+4.0/debian/patches/git_install-printbackends.patch
Modified:
    desktop/experimental/gtk+4.0/debian/changelog
    desktop/experimental/gtk+4.0/debian/libgtk-4-0.install.in
    desktop/experimental/gtk+4.0/debian/libgtk-4-common.install.in
    desktop/experimental/gtk+4.0/debian/patches/series

Modified: desktop/experimental/gtk+4.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B4.0/debian/changelog?rev=54565&op=diff
==============================================================================
--- desktop/experimental/gtk+4.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gtk+4.0/debian/changelog	[utf-8] Thu Oct 26 21:27:01 2017
@@ -4,10 +4,12 @@
   * Switch to meson
   * README has been renamed to README.md
   * debian/libgtk-4-0.symbols: Update
+  * debian/libgtk-4-common.install.in: themes are bundled in the gtkresources
   * Refresh no-accessibility-dump.patch
   * Disable 018_gdkenumtypes.c_location.patch: might not be needed any more
   * Add disable-return-type-error.patch to work around GNOME bug #789180
-  * Temporarily don't install themes and print backends, build bug?
+  * Cherry-pick patches:
+    - git_install-printbackends.patch
 
  -- Jeremy Bicha <jbicha at debian.org>  Wed, 18 Oct 2017 18:07:11 -0400
 

Modified: desktop/experimental/gtk+4.0/debian/libgtk-4-0.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B4.0/debian/libgtk-4-0.install.in?rev=54565&op=diff
==============================================================================
--- desktop/experimental/gtk+4.0/debian/libgtk-4-0.install.in	[utf-8] (original)
+++ desktop/experimental/gtk+4.0/debian/libgtk-4-0.install.in	[utf-8] Thu Oct 26 21:27:01 2017
@@ -1,4 +1,4 @@
 usr/bin/gtk4-query-immodules @LIBDIR@/@SHARED_PKG@
 @MODULES_BASE_PATH@/immodules/*.so
-#@MODULES_BASE_PATH@/printbackends/*.so
+ at MODULES_BASE_PATH@/printbackends/*.so
 @LIBDIR@/libgtk*.so.*

Modified: desktop/experimental/gtk+4.0/debian/libgtk-4-common.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B4.0/debian/libgtk-4-common.install.in?rev=54565&op=diff
==============================================================================
--- desktop/experimental/gtk+4.0/debian/libgtk-4-common.install.in	[utf-8] (original)
+++ desktop/experimental/gtk+4.0/debian/libgtk-4-common.install.in	[utf-8] Thu Oct 26 21:27:01 2017
@@ -1,6 +1,5 @@
 @CONFDIR@/im-multipress.conf
 usr/share/locale
-#usr/share/themes
 # Currently shipped by libgtk-3-common
 #usr/share/glib-2.0/schemas/org.gtk.Settings.EmojiChooser.gschema.xml
 #usr/share/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml

Added: desktop/experimental/gtk+4.0/debian/patches/git_install-printbackends.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B4.0/debian/patches/git_install-printbackends.patch?rev=54565&op=file
==============================================================================
--- desktop/experimental/gtk+4.0/debian/patches/git_install-printbackends.patch	(added)
+++ desktop/experimental/gtk+4.0/debian/patches/git_install-printbackends.patch	[utf-8] Thu Oct 26 21:27:01 2017
@@ -0,0 +1,85 @@
+From fda120ceece7b15daee81430a45ca795719eecca Mon Sep 17 00:00:00 2001
+From: Marek Kasik <mkasik at redhat.com>
+Date: Thu, 19 Oct 2017 13:59:58 +0200
+Subject: printing: Install printbackends
+
+Add "install : true" for each printbackend so that they are installed.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=789185
+---
+ modules/printbackends/cloudprint/meson.build | 3 ++-
+ modules/printbackends/cups/meson.build       | 3 ++-
+ modules/printbackends/file/meson.build       | 3 ++-
+ modules/printbackends/lpr/meson.build        | 3 ++-
+ modules/printbackends/papi/meson.build       | 3 ++-
+ modules/printbackends/test/meson.build       | 3 ++-
+ 6 files changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/modules/printbackends/cloudprint/meson.build b/modules/printbackends/cloudprint/meson.build
+index c6193f4..f5217cb 100644
+--- a/modules/printbackends/cloudprint/meson.build
++++ b/modules/printbackends/cloudprint/meson.build
+@@ -7,4 +7,5 @@ shared_module('printbackend-cloudprint',
+                 '-DGTK_DISABLE_DEPRECATION_WARNINGS',
+               ],
+               dependencies: [ libgtk_dep, rest_dep, json_glib_dep ],
+-              install_dir: printbackends_install_dir)
++              install_dir: printbackends_install_dir,
++              install : true)
+diff --git a/modules/printbackends/cups/meson.build b/modules/printbackends/cups/meson.build
+index e69788d..a6f83d5 100644
+--- a/modules/printbackends/cups/meson.build
++++ b/modules/printbackends/cups/meson.build
+@@ -18,4 +18,5 @@ shared_module('printbackend-cups',
+                 '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
+               ],
+               dependencies: [libgtk_dep, libcups, colord_dep],
+-              install_dir: printbackends_install_dir)
++              install_dir: printbackends_install_dir,
++              install : true)
+diff --git a/modules/printbackends/file/meson.build b/modules/printbackends/file/meson.build
+index 52ab3a3..b1604be 100644
+--- a/modules/printbackends/file/meson.build
++++ b/modules/printbackends/file/meson.build
+@@ -6,4 +6,5 @@ shared_module('printbackend-file',
+                 '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
+               ],
+               dependencies: libgtk_dep,
+-              install_dir: printbackends_install_dir)
++              install_dir: printbackends_install_dir,
++              install : true)
+diff --git a/modules/printbackends/lpr/meson.build b/modules/printbackends/lpr/meson.build
+index 95a982d..581ca77 100644
+--- a/modules/printbackends/lpr/meson.build
++++ b/modules/printbackends/lpr/meson.build
+@@ -6,4 +6,5 @@ shared_module('printbackend-lpr',
+                 '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
+               ],
+               dependencies: libgtk_dep,
+-              install_dir: printbackends_install_dir)
++              install_dir: printbackends_install_dir,
++              install : true)
+diff --git a/modules/printbackends/papi/meson.build b/modules/printbackends/papi/meson.build
+index feef640..647234e 100644
+--- a/modules/printbackends/papi/meson.build
++++ b/modules/printbackends/papi/meson.build
+@@ -6,4 +6,5 @@ shared_module('printbackend-papi',
+                 '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
+               ],
+               dependencies: [libgtk_dep, libpapi],
+-              install_dir: printbackends_install_dir)
++              install_dir: printbackends_install_dir,
++              install : true)
+diff --git a/modules/printbackends/test/meson.build b/modules/printbackends/test/meson.build
+index a8df4fe..29cf00b 100644
+--- a/modules/printbackends/test/meson.build
++++ b/modules/printbackends/test/meson.build
+@@ -6,4 +6,5 @@ shared_module('printbackend-test',
+                 '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
+               ],
+               dependencies: libgtk_dep,
+-              install_dir: printbackends_install_dir)
++              install_dir: printbackends_install_dir,
++              install : true)
+
+

Modified: desktop/experimental/gtk+4.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B4.0/debian/patches/series?rev=54565&op=diff
==============================================================================
--- desktop/experimental/gtk+4.0/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/gtk+4.0/debian/patches/series	[utf-8] Thu Oct 26 21:27:01 2017
@@ -3,3 +3,4 @@
 reftest-known-fail.patch
 gdk-x11-Check-if-we-have-access-to-GL-before-using-G.patch
 disable-return-type-error.patch
+git_install-printbackends.patch




More information about the pkg-gnome-commits mailing list