diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2010-08-29 21:21:53 +0000 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2010-08-29 21:21:53 +0000 |
commit | 13f01e6eb8ad386e162d5aafe01e6e4d9cc5da3b (patch) | |
tree | f27c7e0f8b3feec343f3982849471122c128b874 /net-print/gnome-cups-manager | |
parent | Version bump. (diff) | |
download | historical-13f01e6eb8ad386e162d5aafe01e6e4d9cc5da3b.tar.gz historical-13f01e6eb8ad386e162d5aafe01e6e4d9cc5da3b.tar.bz2 historical-13f01e6eb8ad386e162d5aafe01e6e4d9cc5da3b.zip |
Do not add CFLAGS to CXXFLAGS, bug #234028. Fix automagic samba support, bug #288392.
Package-Manager: portage-2.2_rc68/cvs/Linux x86_64
Diffstat (limited to 'net-print/gnome-cups-manager')
5 files changed, 196 insertions, 2 deletions
diff --git a/net-print/gnome-cups-manager/ChangeLog b/net-print/gnome-cups-manager/ChangeLog index 024b3cd4ac04..60ea8fcbdedb 100644 --- a/net-print/gnome-cups-manager/ChangeLog +++ b/net-print/gnome-cups-manager/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-print/gnome-cups-manager # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/gnome-cups-manager/ChangeLog,v 1.95 2010/07/20 15:39:48 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/gnome-cups-manager/ChangeLog,v 1.96 2010/08/29 21:21:53 eva Exp $ + +*gnome-cups-manager-0.33-r2 (29 Aug 2010) + + 29 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org> + +gnome-cups-manager-0.33-r2.ebuild, + +files/gnome-cups-manager-0.33-automagic-samba.patch, + +files/gnome-cups-manager-0.33-cxxflags-separation.patch: + Do not add CFLAGS to CXXFLAGS, bug #234028. Fix automagic samba support, + bug #288392. 20 Jul 2010; Jeroen Roovers <jer@gentoo.org> gnome-cups-manager-0.33-r1.ebuild: diff --git a/net-print/gnome-cups-manager/Manifest b/net-print/gnome-cups-manager/Manifest index 39f1eba5beca..b7466735fc37 100644 --- a/net-print/gnome-cups-manager/Manifest +++ b/net-print/gnome-cups-manager/Manifest @@ -1,5 +1,18 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX gnome-cups-manager-0.33-automagic-samba.patch 888 RMD160 a52254ab0be87e41a313fa2d152f65ed2f6ad32b SHA1 4e5e1f8755899520ba4ac82019d898effd5bdd14 SHA256 d0afdcb5388537c237374635ce0f976337c8c50c3e013ef39084ca71f4e3065f +AUX gnome-cups-manager-0.33-cxxflags-separation.patch 1865 RMD160 dc22f15623e6dedb8c6bc6f76a146b9451181bfc SHA1 3b1a8d1cc10217933bb5308527a929f042285839 SHA256 98ca46d7e3a250ca86c670ce36d4233ab814b61a7d92c753fdcc39eff3bb1c6e DIST gnome-cups-manager-0.33.tar.bz2 600222 RMD160 d116909407d3a96375bb3ab4213e7fe9e8d372c1 SHA1 1efe69b33d25569d9f1f5010e25a248680d0751f SHA256 9d4fdefc8f69c0e1b330bb399b162f1f1005afdadf346e4f5d739de75c660dca DIST gnome-cups-manager-patches-0.33-r1.tar.bz2 15832 RMD160 2d04d26b0e553344ab3105ada8169fb8b9878063 SHA1 46556de2f82b3dfd4b39bb014c83203349d41fde SHA256 4735aa74391433fa45ca1a9ccab7bd9c8e8b23ea797de0fec34d77eb569dceb1 EBUILD gnome-cups-manager-0.33-r1.ebuild 1251 RMD160 21fad2aae3beaa5a555a1277ead4b9756d3a3fc9 SHA1 a0a21396585a67943146bf07765a49a8ab4707ee SHA256 f094625c10aeaef4932b1dd0c97c6544ef88fd5db9140c73e4a547768deb6da4 -MISC ChangeLog 12936 RMD160 961418e7ddaeb2a5d53d08e1e539447a8bd47d55 SHA1 0b90191994b107c5bd739b0f73b43445e5aa9390 SHA256 9ee532097b90c335d5b25366fa5f98f6ff408a360719fbb47cead241c490fca2 +EBUILD gnome-cups-manager-0.33-r2.ebuild 1746 RMD160 da11d9c2f3c7cc963affd67e0c2738cd88345200 SHA1 3831f303154cfd8ceb453cf1258fd65746693a7b SHA256 51966ad76859b0f2bd0f34231d8ab57cf053bed13da554b4fc04eae40fbc6421 +MISC ChangeLog 13278 RMD160 6e712da2ae5c24a64e7d0fe5a962a0d29528e3a6 SHA1 a51eb1d18d312e1dee1623dd7755ea90d8096826 SHA256 0e7261032c724ca13fe2a1042c911eb8a7c6913908ae873d8f1068311a2f95b9 MISC metadata.xml 180 RMD160 082aa46c6fe033d8548d5351c7073d98a11e952b SHA1 f006fd73fec1f95de0831e1d942d6078620fe43f SHA256 21576b6f9d195cfd7a7f38ef661ffad9e39e979c1c98c9af12ce85398fc133a9 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iEYEARECAAYFAkx6z3gACgkQ1fmVwcYIWAYm6wCbBUa3D38XZQnA2HL/KsYWndsS +gyYAoNpwjQUxahTepJY9eLN5R5AIMf1j +=9EMa +-----END PGP SIGNATURE----- diff --git a/net-print/gnome-cups-manager/files/gnome-cups-manager-0.33-automagic-samba.patch b/net-print/gnome-cups-manager/files/gnome-cups-manager-0.33-automagic-samba.patch new file mode 100644 index 000000000000..a834d4c8ba39 --- /dev/null +++ b/net-print/gnome-cups-manager/files/gnome-cups-manager-0.33-automagic-samba.patch @@ -0,0 +1,32 @@ +From d3750520a2b23d0757504941ba2066cb63b320d0 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Sun, 29 Aug 2010 16:30:23 +0200 +Subject: [PATCH] [gentoo] Fix automagic samba support + +--- + configure.in | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/configure.in b/configure.in +index bb15f54..c96fcba 100644 +--- a/configure.in ++++ b/configure.in +@@ -28,10 +28,14 @@ LIBBONOBO_REQUIRED=2.0.0 + LIBGNOMECUPS_REQUIRED=0.2.0 + + SMBLIBS= ++AC_ARG_ENABLE([samba], ++ AS_HELP_STRING([--enable-samba], [enable samba support])) ++if test "$enable_samba" = "yes"; then + AC_CHECK_LIB(smbclient, smbc_opendir, [ + AC_DEFINE(HAVE_LIBSMBCLIENT, [], ["Do we have libsmbclient"]) + SMBLIBS=-lsmbclient +-]) ++], [AC_MSG_ERROR([libsmclient not found])]) ++fi + AC_SUBST(SMBLIBS) + AC_SUBST(LIBGNOME_REQUIRED) + AC_SUBST(LIBGNOMEUI_REQUIRED) +-- +1.7.2.2 + diff --git a/net-print/gnome-cups-manager/files/gnome-cups-manager-0.33-cxxflags-separation.patch b/net-print/gnome-cups-manager/files/gnome-cups-manager-0.33-cxxflags-separation.patch new file mode 100644 index 000000000000..a8ca8646384a --- /dev/null +++ b/net-print/gnome-cups-manager/files/gnome-cups-manager-0.33-cxxflags-separation.patch @@ -0,0 +1,71 @@ +From f798321d4d7e3059bc51730124f9da9d5c2aff9f Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Sun, 29 Aug 2010 15:21:17 +0200 +Subject: [PATCH] [gentoo] Do not add CFLAGS to CPPFLAGS + +--- + configure.in | 1 + + gnome-cups-add/Makefile.am | 6 ++++-- + gnome-cups-manager/Makefile.am | 6 ++++-- + libgnomecups/Makefile.am | 6 ++++-- + 4 files changed, 13 insertions(+), 6 deletions(-) + +diff --git a/configure.in b/configure.in +index 88902da..bb15f54 100644 +--- a/configure.in ++++ b/configure.in +@@ -16,6 +16,7 @@ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) + + GNOME_COMPILE_WARNINGS(maximum) + ++AC_PROG_CC + AC_PROG_CXX + + GTK_REQUIRED=2.3.1 +diff --git a/gnome-cups-add/Makefile.am b/gnome-cups-add/Makefile.am +index 2d5ceee..9c16248 100644 +--- a/gnome-cups-add/Makefile.am ++++ b/gnome-cups-add/Makefile.am +@@ -1,5 +1,7 @@ +-INCLUDES = \ +- $(WARN_CFLAGS) \ ++AM_CFLAGS = $(WARN_CFLAGS) ++AM_CXXFLAGS = $(WARN_CXXFLAGS) ++ ++AM_CPPFLAGS = \ + $(GNOME_CFLAGS) \ + -I$(top_srcdir) \ + -DPREFIX=\""$(prefix)"\" \ +diff --git a/gnome-cups-manager/Makefile.am b/gnome-cups-manager/Makefile.am +index b8fe59a..86721ad 100644 +--- a/gnome-cups-manager/Makefile.am ++++ b/gnome-cups-manager/Makefile.am +@@ -1,5 +1,7 @@ +-INCLUDES = \ +- $(WARN_CFLAGS) \ ++AM_CFLAGS = $(WARN_CFLAGS) ++AM_CXXFLAGS = $(WARN_CXXFLAGS) ++ ++AM_CPPFLAGS = \ + $(GNOME_CFLAGS) \ + -I$(top_srcdir) \ + -DPREFIX=\""$(prefix)"\" \ +diff --git a/libgnomecups/Makefile.am b/libgnomecups/Makefile.am +index 75a2fc7..6b8cea0 100644 +--- a/libgnomecups/Makefile.am ++++ b/libgnomecups/Makefile.am +@@ -1,7 +1,9 @@ + SUBDIRS=snmpkit + +-INCLUDES = \ +- $(WARN_CFLAGS) \ ++AM_CFLAGS = $(WARN_CFLAGS) ++AM_CXXFLAGS = $(WARN_CXXFLAGS) ++ ++AM_CPPFLAGS = \ + $(GNOME_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_builddir) \ +-- +1.7.2.2 + diff --git a/net-print/gnome-cups-manager/gnome-cups-manager-0.33-r2.ebuild b/net-print/gnome-cups-manager/gnome-cups-manager-0.33-r2.ebuild new file mode 100644 index 000000000000..21293f58ae2c --- /dev/null +++ b/net-print/gnome-cups-manager/gnome-cups-manager-0.33-r2.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-print/gnome-cups-manager/gnome-cups-manager-0.33-r2.ebuild,v 1.1 2010/08/29 21:21:53 eva Exp $ + +EAPI="2" +GCONF_DEBUG="no" + +inherit autotools eutils gnome2 flag-o-matic + +DESCRIPTION="GNOME CUPS Printer Management Interface" +HOMEPAGE="http://www.gnome.org/" + +SRC_URI="${SRC_URI} + mirror://gentoo/${PN}-patches-${PV}-r1.tar.bz2" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="samba" + +# FIXME: samba support is automatic +COMMON=">=x11-libs/gtk+-2.3.1 + >=dev-libs/glib-2.3.1 + >=gnome-base/libgnome-2.14 + >=gnome-base/libgnomeui-2.14 + >=gnome-base/libglade-2 + >=gnome-base/libbonobo-2 + >=net-print/libgnomecups-0.2.3 + gnome-base/gnome-keyring + samba? ( net-fs/samba[smbclient] )" + +RDEPEND="${COMMON} + x11-libs/gksu" + +DEPEND="${COMMON} + >=dev-util/pkgconfig-0.9 + >=dev-util/intltool-0.35" + +DOCS="ChangeLog NEWS README" + +pkg_setup() { + G2CONF="${G2CONF} --disable-static $(use_enable samba)" +} + +src_prepare() { + gnome2_src_prepare + + # Do not add CFLAGS to CPPFLAGS, bug #234028 + epatch "${FILESDIR}/${PN}-0.33-cxxflags-separation.patch" + + # Fix automagic samba support, bug #288392 + epatch "${FILESDIR}/${PN}-0.33-automagic-samba.patch" + + # Apply ubuntu patchset + rm "${WORKDIR}"/patches/140_all_ui_tooltip.patch || \ + die "removing patch failed" + export EPATCH_SOURCE="${WORKDIR}/patches" \ + EPATCH_SUFFIX="patch" \ + EPATCH_MULTI_MSG="Applying Ubuntu patches (enhancements) ..." + epatch + + intltoolize --force --copy --automake || die + eautoreconf +} + +src_install() { + gnome2_src_install + # debian-specific. + rm "${D}"/usr/sbin/gnome-cups-switch +} |