summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarinus Schraal <foser@gentoo.org>2004-12-12 17:54:10 +0000
committerMarinus Schraal <foser@gentoo.org>2004-12-12 17:54:10 +0000
commit648ec15a6391e6f1e846b4a6a6ad705f2eb90a28 (patch)
tree540786b4430f7f0e62a548123cee456f057fe363 /gnome-extra
parentMoved net-dialup/capi4k-firmware to net-dialup/isdn-firmware (diff)
downloadgentoo-2-648ec15a6391e6f1e846b4a6a6ad705f2eb90a28.tar.gz
gentoo-2-648ec15a6391e6f1e846b4a6a6ad705f2eb90a28.tar.bz2
gentoo-2-648ec15a6391e6f1e846b4a6a6ad705f2eb90a28.zip
fix deprecation bug
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/gcalctool/ChangeLog5
-rw-r--r--gnome-extra/gcalctool/files/gcalctool-4.4.20-remove_disable_deprecated.patch30
-rw-r--r--gnome-extra/gcalctool/gcalctool-4.4.19.ebuild13
-rw-r--r--gnome-extra/gcalctool/gcalctool-4.4.20.ebuild15
4 files changed, 57 insertions, 6 deletions
diff --git a/gnome-extra/gcalctool/ChangeLog b/gnome-extra/gcalctool/ChangeLog
index 326a0a1da355..fe27bda219f9 100644
--- a/gnome-extra/gcalctool/ChangeLog
+++ b/gnome-extra/gcalctool/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for gnome-extra/gcalctool
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.40 2004/12/11 11:04:52 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.41 2004/12/12 17:54:10 foser Exp $
+
+ 12 Dec 2004; foser <foser@gentoo.org> gcalctool-4.4.{19,20}.ebuild :
+ Fix deprecated warnings (#73141)
11 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
gcalctool-4.4.19.ebuild:
diff --git a/gnome-extra/gcalctool/files/gcalctool-4.4.20-remove_disable_deprecated.patch b/gnome-extra/gcalctool/files/gcalctool-4.4.20-remove_disable_deprecated.patch
new file mode 100644
index 000000000000..6738d16634be
--- /dev/null
+++ b/gnome-extra/gcalctool/files/gcalctool-4.4.20-remove_disable_deprecated.patch
@@ -0,0 +1,30 @@
+diff -uNr gcalctool-4.4.20/gcalctool/Makefile.am gcalctool-4.4.20.depr/gcalctool/Makefile.am
+--- gcalctool-4.4.20/gcalctool/Makefile.am 2004-06-09 19:33:20.000000000 +0200
++++ gcalctool-4.4.20.depr/gcalctool/Makefile.am 2004-12-12 18:41:11.906241520 +0100
+@@ -2,11 +2,6 @@
+
+ INCLUDES = \
+ -I$(includedir) \
+- -DGNOME_DISABLE_DEPRECATED \
+- -DG_DISABLE_DEPRECATED \
+- -DGDK_PIXBUF_DISABLE_DEPRECATED \
+- -DGDK_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ -DPACKAGE_PIXMAP_DIR=\""$(prefix)/$(DATADIRNAME)/pixmaps"\" \
+diff -uNr gcalctool-4.4.20/gcalctool/Makefile.in gcalctool-4.4.20.depr/gcalctool/Makefile.in
+--- gcalctool-4.4.20/gcalctool/Makefile.in 2004-10-12 18:44:48.000000000 +0200
++++ gcalctool-4.4.20.depr/gcalctool/Makefile.in 2004-12-12 18:41:19.871030688 +0100
+@@ -228,11 +228,6 @@
+ target_alias = @target_alias@
+ INCLUDES = \
+ -I$(includedir) \
+- -DGNOME_DISABLE_DEPRECATED \
+- -DG_DISABLE_DEPRECATED \
+- -DGDK_PIXBUF_DISABLE_DEPRECATED \
+- -DGDK_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ -DPACKAGE_PIXMAP_DIR=\""$(prefix)/$(DATADIRNAME)/pixmaps"\" \
diff --git a/gnome-extra/gcalctool/gcalctool-4.4.19.ebuild b/gnome-extra/gcalctool/gcalctool-4.4.19.ebuild
index 0090e33784a2..d91b4dd7a762 100644
--- a/gnome-extra/gcalctool/gcalctool-4.4.19.ebuild
+++ b/gnome-extra/gcalctool/gcalctool-4.4.19.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-4.4.19.ebuild,v 1.7 2004/12/11 11:04:52 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-4.4.19.ebuild,v 1.8 2004/12/12 17:54:10 foser Exp $
-inherit gnome2
+inherit gnome2 eutils
DESCRIPTION="A scientific calculator for Gnome2"
HOMEPAGE="http://calctool.sourceforge.net/"
@@ -24,6 +24,15 @@ DEPEND="${RDEPEND}
DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO MAINTAINERS"
+src_unpack() {
+
+ unpack ${A}
+
+ cd ${S}
+ epatch ${FILESDIR}/${PN}-4.4.20-remove_disable_deprecated.patch
+
+}
+
src_install() {
gnome2_src_install
diff --git a/gnome-extra/gcalctool/gcalctool-4.4.20.ebuild b/gnome-extra/gcalctool/gcalctool-4.4.20.ebuild
index 583e9f83851e..0be6bbdf682d 100644
--- a/gnome-extra/gcalctool/gcalctool-4.4.20.ebuild
+++ b/gnome-extra/gcalctool/gcalctool-4.4.20.ebuild
@@ -1,15 +1,15 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-4.4.20.ebuild,v 1.1 2004/11/25 04:58:19 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-4.4.20.ebuild,v 1.2 2004/12/12 17:54:10 foser Exp $
-inherit gnome2
+inherit gnome2 eutils
DESCRIPTION="A scientific calculator for Gnome2"
HOMEPAGE="http://calctool.sourceforge.net/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~amd64 ~mips ~arm"
+KEYWORDS="x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~amd64 ~mips ~arm"
IUSE=""
RDEPEND=">=x11-libs/gtk+-2
@@ -24,6 +24,15 @@ DEPEND="${RDEPEND}
DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO MAINTAINERS"
+src_unpack() {
+
+ unpack ${A}
+
+ cd ${S}
+ epatch ${FILESDIR}/${P}-remove_disable_deprecated.patch
+
+}
+
src_install() {
gnome2_src_install