public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Alexandre Restovtsev" <tetromino@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
Date: Fri, 24 Jun 2011 17:35:53 +0000 (UTC)	[thread overview]
Message-ID: <48cb6a4457fc35a7d9a139925836b35b5cbe2a25.tetromino@gentoo> (raw)

commit:     48cb6a4457fc35a7d9a139925836b35b5cbe2a25
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Thu Jun 23 04:46:57 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Jun 24 17:08:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=48cb6a44

gnome-base/gnome-control-center: cups-1.5 and https handler fixes

* Add a patch for cups-1.5 header changes from upstream git (will be in
next release).
* Add a patch to correctly set the https handler, as discussed via email
(upstream bug 653211).
* Disable maintainer mode.

---
 .../gnome-control-center-3.0.2-cups-ppd.h.patch    |   46 ++++++++++++++++++++
 .../gnome-control-center-3.0.2-https-handler.patch |   28 ++++++++++++
 ...ebuild => gnome-control-center-3.0.2-r1.ebuild} |    7 +++
 3 files changed, 81 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-cups-ppd.h.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-cups-ppd.h.patch
new file mode 100644
index 0000000..ce2a75d
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-cups-ppd.h.patch
@@ -0,0 +1,46 @@
+From 246dfbcca4906db9c2ef01990ad482270324309e Mon Sep 17 00:00:00 2001
+From: Marek Kasik <mkasik@redhat.com>
+Date: Mon, 20 Jun 2011 15:04:25 +0000
+Subject: Printers: Include cups/ppd.h explicitly
+
+cups/ppd.h is not included by cups/cups.h since CUPS 1.5.
+---
+diff --git a/configure.ac b/configure.ac
+index b26fb7c..b7e6259 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -145,7 +145,7 @@ if test x"$enable_cups" != x"no" ; then
+   CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 1`
+   CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 2`
+ 
+-  AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h],,
++  AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h cups/ppd.h],,
+                    AC_MSG_ERROR([CUPS headers not found but CUPS support requested]))
+ 
+   if ! test $CUPS_API_MAJOR -gt 1 -o \
+diff --git a/panels/printers/pp-new-printer-dialog.c b/panels/printers/pp-new-printer-dialog.c
+index 0b9ece9..69372c2 100644
+--- a/panels/printers/pp-new-printer-dialog.c
++++ b/panels/printers/pp-new-printer-dialog.c
+@@ -31,6 +31,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+ 
+ #include "pp-new-printer-dialog.h"
+ #include "pp-utils.h"
+diff --git a/panels/printers/pp-utils.c b/panels/printers/pp-utils.c
+index 8dbe04f..cb7c29f 100644
+--- a/panels/printers/pp-utils.c
++++ b/panels/printers/pp-utils.c
+@@ -25,6 +25,7 @@
+ #include <glib/gstdio.h>
+ #include <gtk/gtk.h>
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+ #include <dbus/dbus-glib.h>
+ 
+ #include "pp-utils.h"
+--
+cgit v0.9

diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-https-handler.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-https-handler.patch
new file mode 100644
index 0000000..45e3e50
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-https-handler.patch
@@ -0,0 +1,28 @@
+From 6a6a8583803464d4b56870c7faf4db035b97e12d Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Thu, 23 Jun 2011 00:05:34 -0400
+Subject: [PATCH] Fix https scheme handler app setting (bug #653211)
+
+default_app_changed() contains a typo: we need to set the https
+handler app when the user changes the http app chooser, not the
+(non-existent) https app chooser.
+---
+ panels/info/cc-info-panel.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/panels/info/cc-info-panel.c b/panels/info/cc-info-panel.c
+index 2283896..f4dba1b 100644
+--- a/panels/info/cc-info-panel.c
++++ b/panels/info/cc-info-panel.c
+@@ -922,7 +922,7 @@ default_app_changed (GtkAppChooserButton *button,
+     }
+ 
+   /* Set https support for the browser as well */
+-  if (g_str_equal (content_type, "x-scheme-handler/https"))
++  if (g_str_equal (content_type, "x-scheme-handler/http"))
+     {
+       if (g_app_info_set_as_default_for_type (info, "x-scheme-handler/https", &error) == FALSE)
+         {
+-- 
+1.7.5.3
+

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.0.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.0.2-r1.ebuild
similarity index 92%
rename from gnome-base/gnome-control-center/gnome-control-center-3.0.2.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.0.2-r1.ebuild
index 5b26187..69e422b 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.0.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.0.2-r1.ebuild
@@ -91,6 +91,7 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-update-mimedb
 		--disable-static
+		--disable-maintainer-mode
 		$(use_with cheese)
 		$(use_enable cups)
 		$(use_with socialweb libsocialweb)"
@@ -103,5 +104,11 @@ src_prepare() {
 	sed -e 's:no-undefined:-no-undefined:' \
 		-i libgnome-control-center/Makefile.* || die "sed failed"
 
+	# cups-1.5 compatibility; will be in next release
+	epatch "${FILESDIR}/${P}-cups-ppd.h.patch"
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=653211
+	epatch "${FILESDIR}/${PN}-3.0.2-https-handler.patch"
+
 	gnome2_src_prepare
 }



             reply	other threads:[~2011-06-24 17:37 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-24 17:35 Alexandre Restovtsev [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-03-25  0:56 [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/ Ole Reifschneider
2015-10-02 12:50 Ole Reifschneider
2015-05-10 17:20 Gilles Dartiguelongue
2014-10-12 23:19 Gilles Dartiguelongue
2014-04-25 21:07 Gilles Dartiguelongue
2014-04-20 18:17 Gilles Dartiguelongue
2014-04-20 18:17 Gilles Dartiguelongue
2013-12-09 23:06 Gilles Dartiguelongue
2012-12-07 20:02 Arun Raghavan
2012-10-27  8:43 Priit Laes
2012-09-21  0:27 Nirbheek Chauhan
2012-09-10 16:13 Priit Laes
2012-09-10  5:08 Nirbheek Chauhan
2012-07-19  2:47 Alexandre Restovtsev
2012-05-25  8:22 Alexandre Restovtsev
2012-03-26  8:20 Nirbheek Chauhan
2011-10-28  5:28 Alexandre Restovtsev
2011-07-12  0:28 Alexandre Restovtsev
2011-03-29  8:35 Nirbheek Chauhan
2011-03-26  0:37 Nirbheek Chauhan
2011-02-28  7:48 Nirbheek Chauhan
2011-02-18  6:31 Nirbheek Chauhan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=48cb6a4457fc35a7d9a139925836b35b5cbe2a25.tetromino@gentoo \
    --to=tetromino@gmail.com \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox