r38368 - in /desktop/unstable/gnome-settings-daemon/debian: changelog patches/23_cups-1.6_IPP_API.patch patches/24_hide_ppd_deprecation_warnings.patch patches/series
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Tue Jun 4 23:22:55 UTC 2013
Author: biebl
Date: Tue Jun 4 23:22:54 2013
New Revision: 38368
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=38368
Log:
Cherry-pick patches from upstream Git to fix build failures with CUPS 1.6.
Added:
desktop/unstable/gnome-settings-daemon/debian/patches/23_cups-1.6_IPP_API.patch
desktop/unstable/gnome-settings-daemon/debian/patches/24_hide_ppd_deprecation_warnings.patch
Modified:
desktop/unstable/gnome-settings-daemon/debian/changelog
desktop/unstable/gnome-settings-daemon/debian/patches/series
Modified: desktop/unstable/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/changelog?rev=38368&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] Tue Jun 4 23:22:54 2013
@@ -5,6 +5,9 @@
+ Update patch to not write out of the array bounds. Fixes a crash
when the "Disable touchpad while typing" option is activated.
Closes: #684998.
+
+ [ Michael Biebl ]
+ * Cherry-pick patches from upstream Git to fix build failures with CUPS 1.6.
-- Michael Biebl <biebl at debian.org> Wed, 05 Jun 2013 01:13:08 +0200
Added: desktop/unstable/gnome-settings-daemon/debian/patches/23_cups-1.6_IPP_API.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/23_cups-1.6_IPP_API.patch?rev=38368&op=file
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/23_cups-1.6_IPP_API.patch (added)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/23_cups-1.6_IPP_API.patch [utf-8] Tue Jun 4 23:22:54 2013
@@ -1,0 +1,91 @@
+commit 644b7e358f992f35f370015c392ef4c9bcfb9ed8
+Author: Jiri Popelka <jpopelka at redhat.com>
+Date: Wed Jul 11 18:17:12 2012 +0200
+
+ Use CUPS-1.6 IPP API getter/setter functions.
+
+ CUPS 1.6 makes various structures private and
+ introduces these ippGet and ippSet functions
+ for all of the fields in these structures.
+ http://www.cups.org/str.php?L3928
+
+ We define our own accessors when
+ building against CUPS < 1.6.
+
+Index: gnome-settings-daemon-3.4.2+git20121218.7c1322/plugins/print-notifications/gsd-print-notifications-manager.c
+===================================================================
+--- gnome-settings-daemon-3.4.2+git20121218.7c1322.orig/plugins/print-notifications/gsd-print-notifications-manager.c 2013-06-05 01:07:16.004579659 +0200
++++ gnome-settings-daemon-3.4.2+git20121218.7c1322/plugins/print-notifications/gsd-print-notifications-manager.c 2013-06-05 01:07:15.996579572 +0200
+@@ -53,6 +53,16 @@
+ #define REASON_TIMEOUT 15000
+ #define CUPS_CONNECTION_TEST_INTERVAL 300
+
++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
++#define HAVE_CUPS_1_6 1
++#endif
++
++#ifndef HAVE_CUPS_1_6
++#define ippGetStatusCode(ipp) ipp->request.status.status_code
++#define ippGetInteger(attr, element) attr->values[element].integer
++#define ippGetString(attr, element, language) attr->values[element].string.text
++#endif
++
+ struct GsdPrintNotificationsManagerPrivate
+ {
+ GDBusConnection *cups_bus_connection;
+@@ -412,10 +422,10 @@
+ response = cupsDoRequest (http, request, "/");
+
+ if (response) {
+- if (response->request.status.status_code <= IPP_OK_CONFLICT &&
++ if (ippGetStatusCode (response) <= IPP_OK_CONFLICT &&
+ (attr = ippFindAttribute(response, "job-originating-user-name",
+ IPP_TAG_NAME))) {
+- if (g_strcmp0 (attr->values[0].string.text, cupsUser ()) == 0)
++ if (g_strcmp0 (ippGetString (attr, 0, NULL), cupsUser ()) == 0)
+ my_job = TRUE;
+ }
+ ippDelete(response);
+@@ -906,12 +916,12 @@
+ "notify-lease-duration", SUBSCRIPTION_DURATION);
+ response = cupsDoRequest (http, request, "/");
+
+- if (response != NULL && response->request.status.status_code <= IPP_OK_CONFLICT) {
++ if (response != NULL && ippGetStatusCode (response) <= IPP_OK_CONFLICT) {
+ if ((attr = ippFindAttribute (response, "notify-subscription-id",
+ IPP_TAG_INTEGER)) == NULL)
+ g_debug ("No notify-subscription-id in response!\n");
+ else
+- manager->priv->subscription_id = attr->values[0].integer;
++ manager->priv->subscription_id = ippGetInteger (attr, 0);
+ }
+
+ if (response)
+Index: gnome-settings-daemon-3.4.2+git20121218.7c1322/plugins/print-notifications/gsd-printer.c
+===================================================================
+--- gnome-settings-daemon-3.4.2+git20121218.7c1322.orig/plugins/print-notifications/gsd-printer.c 2013-06-05 01:07:16.004579659 +0200
++++ gnome-settings-daemon-3.4.2+git20121218.7c1322/plugins/print-notifications/gsd-printer.c 2013-06-05 01:07:16.000579616 +0200
+@@ -63,6 +63,14 @@
+ #define GNOME_SESSION_PRESENCE_DBUS_PATH "/org/gnome/SessionManager/Presence"
+ #define GNOME_SESSION_PRESENCE_DBUS_IFACE "org.gnome.SessionManager.Presence"
+
++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
++#define HAVE_CUPS_1_6 1
++#endif
++
++#ifndef HAVE_CUPS_1_6
++#define ippGetState(ipp) ipp->state
++#endif
++
+ enum {
+ PRESENCE_STATUS_AVAILABLE = 0,
+ PRESENCE_STATUS_INVISIBLE,
+@@ -725,7 +733,7 @@
+ "AutoConfigure",
+ ("Automatic configuration"));
+ if (response) {
+- if (response->state == IPP_ERROR)
++ if (ippGetState (response) == IPP_ERROR)
+ g_warning ("An error has occured during automatic configuration of new printer.");
+ ippDelete (response);
+ }
Added: desktop/unstable/gnome-settings-daemon/debian/patches/24_hide_ppd_deprecation_warnings.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/24_hide_ppd_deprecation_warnings.patch?rev=38368&op=file
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/24_hide_ppd_deprecation_warnings.patch (added)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/24_hide_ppd_deprecation_warnings.patch [utf-8] Tue Jun 4 23:22:54 2013
@@ -1,0 +1,57 @@
+commit 393ea9b0fd2445023296ad26716b0b2e7e0e6f25
+Author: Marek Kasik <mkasik at redhat.com>
+Date: Tue Mar 26 17:21:34 2013 +0100
+
+ print-notifications: Don't show deprecation warnings
+
+ Hide deprecation warnings by definition of
+ _PPD_DEPRECATED="" because of missing replacement for
+ deprecated function ppdLocalizeIPPReason().
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=696571
+
+Index: gnome-settings-daemon-3.4.2+git20121218.7c1322/configure.ac
+===================================================================
+--- gnome-settings-daemon-3.4.2+git20121218.7c1322.orig/configure.ac 2013-06-05 01:03:33.586089565 +0200
++++ gnome-settings-daemon-3.4.2+git20121218.7c1322/configure.ac 2013-06-05 01:03:33.578089474 +0200
+@@ -411,8 +411,16 @@
+ AC_MSG_ERROR([CUPS 1.4 or newer not found, but CUPS support requested])
+ fi
+
++ # https://bugzilla.gnome.org/show_bug.cgi?id=696571
++ CUPS_CPPFLAGS=""
++ if test $CUPS_API_MAJOR -gt 1 -o \
++ $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6 ; then
++ CUPS_CPPFLAGS=-D_PPD_DEPRECATED=""
++ fi
++
+ CUPS_CFLAGS=`$CUPS_CONFIG --cflags | $SED -e 's/-O\w*//g' -e 's/-m\w*//g'`
+ CUPS_LIBS=`$CUPS_CONFIG --libs`
++ AC_SUBST(CUPS_CPPFLAGS)
+ AC_SUBST(CUPS_CFLAGS)
+ AC_SUBST(CUPS_LIBS)
+ fi
+Index: gnome-settings-daemon-3.4.2+git20121218.7c1322/plugins/print-notifications/Makefile.am
+===================================================================
+--- gnome-settings-daemon-3.4.2+git20121218.7c1322.orig/plugins/print-notifications/Makefile.am 2013-06-05 01:03:33.586089565 +0200
++++ gnome-settings-daemon-3.4.2+git20121218.7c1322/plugins/print-notifications/Makefile.am 2013-06-05 01:03:33.578089474 +0200
+@@ -13,7 +13,8 @@
+ -I$(top_srcdir)/gnome-settings-daemon \
+ -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+ -DLIBEXECDIR=\""$(libexecdir)"\" \
+- $(AM_CPPFLAGS)
++ $(AM_CPPFLAGS) \
++ $(CUPS_CPPFLAGS)
+
+ libprint_notifications_la_CFLAGS = \
+ $(PLUGIN_CFLAGS) \
+@@ -60,7 +61,8 @@
+ -I$(top_srcdir)/gnome-settings-daemon \
+ -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+ -DLIBEXECDIR=\""$(libexecdir)"\" \
+- $(AM_CPPFLAGS)
++ $(AM_CPPFLAGS) \
++ $(CUPS_CPPFLAGS)
+
+ test_print_notifications_CFLAGS = \
+ $(PLUGIN_CFLAGS) \
Modified: desktop/unstable/gnome-settings-daemon/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/series?rev=38368&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] Tue Jun 4 23:22:54 2013
@@ -10,3 +10,5 @@
power-ignore-bad-dbus-requests.patch
revert_git_datetime_dropping.patch
22_backlight_optional.patch
+23_cups-1.6_IPP_API.patch
+24_hide_ppd_deprecation_warnings.patch
More information about the pkg-gnome-commits
mailing list