diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2011-01-30 09:29:46 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-01-30 09:29:46 +0000 |
commit | 662d884890822876fc39ebc97ab3b6fee03ed790 (patch) | |
tree | ef5d27f740ff668472647b708b46bc8d0b1b2811 | |
parent | Move alpha keyword forward, no reason to only keyword an old version. (diff) | |
download | gentoo-2-662d884890822876fc39ebc97ab3b6fee03ed790.tar.gz gentoo-2-662d884890822876fc39ebc97ab3b6fee03ed790.tar.bz2 gentoo-2-662d884890822876fc39ebc97ab3b6fee03ed790.zip |
Fix building with x11-libs/libnotify >= 0.7. Fix missing -I and -l flags for dbus-glib-1 in -FLAGS.patch. punt old
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
-rw-r--r-- | sys-kernel/kerneloops/ChangeLog | 9 | ||||
-rw-r--r-- | sys-kernel/kerneloops/files/0.12-FLAGS.patch | 18 | ||||
-rw-r--r-- | sys-kernel/kerneloops/files/0.12-libnotify-0.7.patch | 39 | ||||
-rw-r--r-- | sys-kernel/kerneloops/files/makefile-standalone-0.10.patch | 63 | ||||
-rw-r--r-- | sys-kernel/kerneloops/kerneloops-0.10.ebuild | 58 | ||||
-rw-r--r-- | sys-kernel/kerneloops/kerneloops-0.11.ebuild | 57 | ||||
-rw-r--r-- | sys-kernel/kerneloops/kerneloops-0.12-r1.ebuild | 34 | ||||
-rw-r--r-- | sys-kernel/kerneloops/kerneloops-0.12.ebuild | 54 |
8 files changed, 73 insertions, 259 deletions
diff --git a/sys-kernel/kerneloops/ChangeLog b/sys-kernel/kerneloops/ChangeLog index 382b1dd31bc6..259d95b6b158 100644 --- a/sys-kernel/kerneloops/ChangeLog +++ b/sys-kernel/kerneloops/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-kernel/kerneloops -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kerneloops/ChangeLog,v 1.13 2010/02/07 19:31:52 jlec Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kerneloops/ChangeLog,v 1.14 2011/01/30 09:29:45 ssuominen Exp $ + + 30 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> files/0.12-FLAGS.patch, + +files/0.12-libnotify-0.7.patch, kerneloops-0.12-r1.ebuild: + Fix building with x11-libs/libnotify >= 0.7. Fix missing -I and -l flags for + dbus-glib-1 in -FLAGS.patch. *kerneloops-0.12-r1 (07 Feb 2010) diff --git a/sys-kernel/kerneloops/files/0.12-FLAGS.patch b/sys-kernel/kerneloops/files/0.12-FLAGS.patch index 519ba22db129..0acfe206970c 100644 --- a/sys-kernel/kerneloops/files/0.12-FLAGS.patch +++ b/sys-kernel/kerneloops/files/0.12-FLAGS.patch @@ -1,28 +1,28 @@ -diff --git a/Makefile b/Makefile -index 86acdf2..c2b8567 100644 ---- a/Makefile -+++ b/Makefile -@@ -10,7 +10,7 @@ LOCALESDIR=/usr/share/locale +diff -ur kerneloops-0.12.orig/Makefile kerneloops-0.12/Makefile +--- kerneloops-0.12.orig/Makefile 2008-04-10 01:02:24.000000000 +0300 ++++ kerneloops-0.12/Makefile 2011-01-30 11:23:39.000000000 +0200 +@@ -10,16 +10,16 @@ MANDIR=/usr/share/man/man8 CC?=gcc -CFLAGS := -O2 -g -fstack-protector -D_FORTIFY_SOURCE=2 -Wall -W -Wstrict-prototypes -Wundef -fno-common -Werror-implicit-function-declaration -Wdeclaration-after-statement +CFLAGS ?= -O2 -g -fstack-protector -D_FORTIFY_SOURCE=2 -Wall -W -Wstrict-prototypes -Wundef -fno-common -Werror-implicit-function-declaration -Wdeclaration-after-statement - MY_CFLAGS := `pkg-config --cflags libnotify gtk+-2.0` +-MY_CFLAGS := `pkg-config --cflags libnotify gtk+-2.0` ++MY_CFLAGS := `pkg-config --cflags dbus-glib-1 libnotify gtk+-2.0` # -@@ -18,8 +18,8 @@ MY_CFLAGS := `pkg-config --cflags libnotify gtk+-2.0` + # pkg-config tends to make programs pull in a ton of libraries, not all # are needed. -Wl,--as-needed tells the linker to just drop unused ones, # and that makes the applet load faster and use less memory. # -LDF_A := -Wl,--as-needed `pkg-config --libs libnotify gtk+-2.0` -LDF_D := -Wl,--as-needed `pkg-config --libs glib-2.0 dbus-glib-1` `curl-config --libs` -Wl,"-z relro" -Wl,"-z now" -+LIBSA := `pkg-config --libs libnotify gtk+-2.0` ++LIBSA := `pkg-config --libs dbus-glib-1 libnotify gtk+-2.0` +LIBSD := `pkg-config --libs glib-2.0 dbus-glib-1` `curl-config --libs` all: kerneloops kerneloops-applet kerneloops.8.gz -@@ -30,11 +30,11 @@ noui: kerneloops kerneloops.8.gz +@@ -30,11 +30,11 @@ kerneloops: kerneloops.o submit.o dmesg.o configfile.o kerneloops.h diff --git a/sys-kernel/kerneloops/files/0.12-libnotify-0.7.patch b/sys-kernel/kerneloops/files/0.12-libnotify-0.7.patch new file mode 100644 index 000000000000..4b0a32e7d832 --- /dev/null +++ b/sys-kernel/kerneloops/files/0.12-libnotify-0.7.patch @@ -0,0 +1,39 @@ +diff -ur kerneloops-0.12.orig/kerneloops-applet.c kerneloops-0.12/kerneloops-applet.c +--- kerneloops-0.12.orig/kerneloops-applet.c 2008-09-13 18:27:50.000000000 +0300 ++++ kerneloops-0.12/kerneloops-applet.c 2011-01-30 11:26:13.000000000 +0200 +@@ -240,8 +240,15 @@ + /* if there's a notification active already, close it first */ + close_notification(); + +- notify = notify_notification_new(summary, message, +- "/usr/share/kerneloops/icon.png", NULL); ++#ifdef NOTIFY_CHECK_VERSION ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ notify = notify_notification_new(summary, message, "/usr/share/kerneloops/icon.png"); ++#else ++ notify = notify_notification_new(summary, message, "/usr/share/kerneloops/icon.png", NULL); ++#endif ++#else ++ notify = notify_notification_new(summary, message, "/usr/share/kerneloops/icon.png", NULL); ++#endif + + notify_notification_set_timeout(notify, 0); + notify_notification_set_urgency(notify, NOTIFY_URGENCY_CRITICAL); +@@ -306,8 +313,15 @@ + + url_to_oops[0] = 0; + +- notify = notify_notification_new(summary, message, +- "/usr/share/kerneloops/icon.png", NULL); ++#ifdef NOTIFY_CHECK_VERSION ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ notify = notify_notification_new(summary, message, "/usr/share/kerneloops/icon.png"); ++#else ++ notify = notify_notification_new(summary, message, "/usr/share/kerneloops/icon.png", NULL); ++#endif ++#else ++ notify = notify_notification_new(summary, message, "/usr/share/kerneloops/icon.png", NULL); ++#endif + + notify_notification_set_timeout(notify, 5000); + notify_notification_set_urgency(notify, NOTIFY_URGENCY_LOW); diff --git a/sys-kernel/kerneloops/files/makefile-standalone-0.10.patch b/sys-kernel/kerneloops/files/makefile-standalone-0.10.patch deleted file mode 100644 index 0de58b4b285e..000000000000 --- a/sys-kernel/kerneloops/files/makefile-standalone-0.10.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- kerneloops-0.10/Makefile 2008-01-05 04:46:04.000000000 -0800 -+++ kerneloops-0.10/Makefile 2008-01-10 16:38:29.000000000 -0800 -@@ -5,6 +5,7 @@ - # - - BINDIR=/usr/bin -+SBINDIR=/usr/sbin - LOCALESDIR=/usr/share/locale - MANDIR=/usr/share/man/man8 - CC?=gcc -@@ -22,6 +23,8 @@ - - all: kerneloops kerneloops-applet kerneloops.1.gz - -+noui: kerneloops kerneloops.1.gz -+ - .c.o: - $(CC) $(CFLAGS) $(MY_CFLAGS) -c -o $@ $< - -@@ -43,21 +46,31 @@ - dist: clean - rm -rf .git .gitignore push.sh .*~ */*~ test/*dbg - -- --install: kerneloops kerneloops-applet kerneloops.1.gz -- mkdir -p $(DESTDIR)/usr/sbin/ $(DESTDIR)/etc/xdg/autostart -- mkdir -p $(DESTDIR)/usr/share/kerneloops $(DESTDIR)/etc/dbus-1/system.d/ -- mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR) -- install -m 0755 kerneloops $(DESTDIR)/usr/sbin -- install -m 0755 kerneloops-applet $(DESTDIR)$(BINDIR) -+install-system: kerneloops.1.gz -+ -mkdir -p $(DESTDIR)$(MANDIR) -+ -mkdir -p $(DESTDIR)/etc/dbus-1/system.d/ - install -m 0644 kerneloops.conf $(DESTDIR)/etc/kerneloops.conf -- desktop-file-install -m 0644 --dir=$(DESTDIR)/etc/xdg/autostart/ kerneloops-applet.desktop - install -m 0644 kerneloops.dbus $(DESTDIR)/etc/dbus-1/system.d/ -- install -m 0644 kerneloops.1.gz $(DESTDIR)$(MANDIR) -+ install -m 0644 kerneloops.1.gz $(DESTDIR)$(MANDIR)/ -+ @(cd po/ && env LOCALESDIR=$(LOCALESDIR) DESTDIR=$(DESTDIR) $(MAKE) install) -+ -+install-kerneloops: kerneloops -+ -mkdir -p $(DESTDIR)$(SBINDIR) -+ install -m 0755 kerneloops $(DESTDIR)$(SBINDIR)/ -+ -+install-applet: kerneloops-applet -+ -mkdir -p $(DESTDIR)$(BINDIR) -+ -mkdir -p $(DESTDIR)/etc/xdg/autostart -+ -mkdir -p $(DESTDIR)/usr/share/kerneloops -+ install -m 0755 kerneloops-applet $(DESTDIR)$(BINDIR)/ -+ desktop-file-install --mode 0644 --dir=$(DESTDIR)/etc/xdg/autostart/ kerneloops-applet.desktop - install -m 0644 icon.png $(DESTDIR)/usr/share/kerneloops/icon.png -- @(cd po/ && env LOCALESDIR=$(LOCALESDIR) DESTDIR=$(DESTDIR) $(MAKE) $@) -- -- -+ -+install: install-system install-kerneloops install-applet -+ -+install-noui: install-system install-kerneloops -+ -+ - # This is for translators. To update your po with new strings, do : - # svn up ; make uptrans LG=fr # or de, ru, hu, it, ... - uptrans: diff --git a/sys-kernel/kerneloops/kerneloops-0.10.ebuild b/sys-kernel/kerneloops/kerneloops-0.10.ebuild deleted file mode 100644 index 83c4730c2a49..000000000000 --- a/sys-kernel/kerneloops/kerneloops-0.10.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kerneloops/kerneloops-0.10.ebuild,v 1.2 2008/02/13 07:54:48 opfer Exp $ - -inherit eutils - -DESCRIPTION="Tool to automatically collect and submit Linux kernel crash signatures" -HOMEPAGE="http://www.kerneloops.org/" -SRC_URI="http://www.kerneloops.org/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86" -IUSE="gtk" - -DEPEND="net-misc/curl - sys-apps/dbus - gtk? ( x11-libs/gtk+ x11-libs/libnotify ) - " -RDEPEND="${DEPEND}" - -src_unpack() { - unpack ${A} - cd "${WORKDIR}" - epatch "${FILESDIR}"/makefile-standalone-0.10.patch -} - -src_compile() { - emake kerneloops || die "Compile deamon failed" - if use gtk ; then - emake kerneloops-applet || die "Compile applet failed" - fi -} - -src_install() { - emake DESTDIR="${D}" install-system || die "Install of system failed" - emake DESTDIR="${D}" install-kerneloops || die "Install of deamon failed" - if use gtk ; then - emake DESTDIR="${D}" install-applet || die "Install of applet failed" - fi - - doinitd "${FILESDIR}"/kerneloops || die "doinitd failed" - -} - -pkg_postinst() { - ewarn "PRIVACY NOTE" - ewarn "You must allow the kerneloops program to send the oops messages" - ewarn "by either editing the /etc/kerneloops.conf file, or by running the" - ewarn "kerneloops-applet program first." - ewarn "Enabling this option will cause your system to submit certain kernel" - ewarn "output to the kerneloops.org website, where it will be available via" - ewarn "this website to developers and everyone else." - ewarn "The submitted info are so-called \"oopses\", kernel crash signature." - ewarn "However, due to the nature of oopses, it may happen that a few" - ewarn "surrounding lines of the oops in the \"dmesg\" are being sent together" - ewarn "with the oops." -} diff --git a/sys-kernel/kerneloops/kerneloops-0.11.ebuild b/sys-kernel/kerneloops/kerneloops-0.11.ebuild deleted file mode 100644 index 6a5bf6e754ae..000000000000 --- a/sys-kernel/kerneloops/kerneloops-0.11.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kerneloops/kerneloops-0.11.ebuild,v 1.2 2008/09/07 17:51:46 maekke Exp $ - -inherit eutils - -DESCRIPTION="Tool to automatically collect and submit Linux kernel crash signatures" -HOMEPAGE="http://www.kerneloops.org/" -SRC_URI="http://www.kerneloops.org/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gtk" - -DEPEND="net-misc/curl - sys-apps/dbus - gtk? ( x11-libs/gtk+ x11-libs/libnotify dev-util/desktop-file-utils ) - " -RDEPEND="${DEPEND}" - -src_unpack() { - unpack ${A} - cd "${WORKDIR}" -} - -src_compile() { - emake kerneloops || die "Compile deamon failed" - if use gtk ; then - emake kerneloops-applet || die "Compile applet failed" - fi -} - -src_install() { - emake DESTDIR="${D}" install-system || die "Install of system failed" - emake DESTDIR="${D}" install-kerneloops || die "Install of deamon failed" - if use gtk ; then - emake DESTDIR="${D}" install-applet || die "Install of applet failed" - fi - - doinitd "${FILESDIR}"/kerneloops || die "doinitd failed" - -} - -pkg_postinst() { - ewarn "PRIVACY NOTE" - ewarn "You must allow the kerneloops program to send the oops messages" - ewarn "by either editing the /etc/kerneloops.conf file, or by running the" - ewarn "kerneloops-applet program first." - ewarn "Enabling this option will cause your system to submit certain kernel" - ewarn "output to the kerneloops.org website, where it will be available via" - ewarn "this website to developers and everyone else." - ewarn "The submitted info are so-called \"oopses\", kernel crash signature." - ewarn "However, due to the nature of oopses, it may happen that a few" - ewarn "surrounding lines of the oops in the \"dmesg\" are being sent together" - ewarn "with the oops." -} diff --git a/sys-kernel/kerneloops/kerneloops-0.12-r1.ebuild b/sys-kernel/kerneloops/kerneloops-0.12-r1.ebuild index a549320282ba..a3866fce4901 100644 --- a/sys-kernel/kerneloops/kerneloops-0.12-r1.ebuild +++ b/sys-kernel/kerneloops/kerneloops-0.12-r1.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kerneloops/kerneloops-0.12-r1.ebuild,v 1.1 2010/02/07 19:31:52 jlec Exp $ - -EAPI="2" +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kerneloops/kerneloops-0.12-r1.ebuild,v 1.2 2011/01/30 09:29:45 ssuominen Exp $ +EAPI=2 inherit eutils toolchain-funcs DESCRIPTION="Tool to automatically collect and submit Linux kernel crash signatures" @@ -15,29 +14,32 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="net-misc/curl - sys-apps/dbus - x11-libs/gtk+ - x11-libs/libnotify - dev-util/desktop-file-utils" -RDEPEND="${DEPEND}" +RDEPEND=">=dev-libs/dbus-glib-0.88 + net-misc/curl + x11-libs/gtk+:2 + x11-libs/libnotify + dev-util/desktop-file-utils" +DEPEND="${RDEPEND} + dev-util/pkgconfig" src_prepare() { - epatch "${FILESDIR}"/${PV}-FLAGS.patch + epatch \ + "${FILESDIR}"/${PV}-FLAGS.patch \ + "${FILESDIR}"/${PV}-libnotify-0.7.patch } src_compile() { emake \ - CC=$(tc-getCC) \ + CC="$(tc-getCC)" \ kerneloops kerneloops-applet || die } src_install() { - emake DESTDIR="${D}" install-system || die "Install of system failed" - emake DESTDIR="${D}" install-kerneloops || die "Install of deamon failed" - emake DESTDIR="${D}" install-applet || die "Install of applet failed" + emake DESTDIR="${D}" install-system || die + emake DESTDIR="${D}" install-kerneloops || die + emake DESTDIR="${D}" install-applet || die - doinitd "${FILESDIR}"/kerneloops || die "doinitd failed" + doinitd "${FILESDIR}"/kerneloops || die dosed 's:\(nodaemon\):\1 --file "${LOGFILE}":g' /etc/init.d/${PN} diff --git a/sys-kernel/kerneloops/kerneloops-0.12.ebuild b/sys-kernel/kerneloops/kerneloops-0.12.ebuild deleted file mode 100644 index d9913586657c..000000000000 --- a/sys-kernel/kerneloops/kerneloops-0.12.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kerneloops/kerneloops-0.12.ebuild,v 1.2 2010/02/07 19:31:52 jlec Exp $ - -inherit eutils - -DESCRIPTION="Tool to automatically collect and submit Linux kernel crash signatures" -HOMEPAGE="http://www.kerneloops.org/" -SRC_URI="http://www.kerneloops.org/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="net-misc/curl - sys-apps/dbus - x11-libs/gtk+ - x11-libs/libnotify - dev-util/desktop-file-utils" -RDEPEND="${DEPEND}" - -src_unpack() { - unpack ${A} - cd "${WORKDIR}" -} - -src_compile() { - emake kerneloops || die "Compile deamon failed" - emake kerneloops-applet || die "Compile applet failed" -} - -src_install() { - emake DESTDIR="${D}" install-system || die "Install of system failed" - emake DESTDIR="${D}" install-kerneloops || die "Install of deamon failed" - emake DESTDIR="${D}" install-applet || die "Install of applet failed" - - doinitd "${FILESDIR}"/kerneloops || die "doinitd failed" - -} - -pkg_postinst() { - ewarn "PRIVACY NOTE" - ewarn "You must allow the kerneloops program to send the oops messages" - ewarn "by either editing the /etc/kerneloops.conf file, or by running the" - ewarn "kerneloops-applet program first." - ewarn "Enabling this option will cause your system to submit certain kernel" - ewarn "output to the kerneloops.org website, where it will be available via" - ewarn "this website to developers and everyone else." - ewarn "The submitted info are so-called \"oopses\", kernel crash signature." - ewarn "However, due to the nature of oopses, it may happen that a few" - ewarn "surrounding lines of the oops in the \"dmesg\" are being sent together" - ewarn "with the oops." -} |