summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2015-08-10 20:26:49 +0200
committerJulian Ospald <hasufell@gentoo.org>2015-08-10 20:26:49 +0200
commitbfb64c54d63176edb35cc9ce62e30c5c629baaaa (patch)
tree1f7d774c69501fb327a93aac969791a6f52b9a88 /media-sound/pnmixer/files
parentsys-devel/binutils-apple: version bump to Xcode 6.3 by Michael Weiser, bug #5... (diff)
downloadgentoo-bfb64c54d63176edb35cc9ce62e30c5c629baaaa.tar.gz
gentoo-bfb64c54d63176edb35cc9ce62e30c5c629baaaa.tar.bz2
gentoo-bfb64c54d63176edb35cc9ce62e30c5c629baaaa.zip
media-sound/pnmixer: revert removal, c7b661a
This reverts commit c7b661aecdac38b4483857dd786d6f694338c592. Gentoo-Bug: 557246
Diffstat (limited to 'media-sound/pnmixer/files')
-rw-r--r--media-sound/pnmixer/files/pnmixer-0.6_pre20111213-build.patch63
-rw-r--r--media-sound/pnmixer/files/pnmixer-0.6_pre20111213-desktopfile.patch15
2 files changed, 78 insertions, 0 deletions
diff --git a/media-sound/pnmixer/files/pnmixer-0.6_pre20111213-build.patch b/media-sound/pnmixer/files/pnmixer-0.6_pre20111213-build.patch
new file mode 100644
index 000000000000..5e4fba2d0750
--- /dev/null
+++ b/media-sound/pnmixer/files/pnmixer-0.6_pre20111213-build.patch
@@ -0,0 +1,63 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Thu Nov 15 23:59:49 UTC 2012
+Subject: build system
+
+respect CFLAGS, use rdynamic
+don't use AM_CFLAGS in configure.in
+fix macros for automake-1.13
+
+--- configure.in
++++ configure.in
+@@ -1,16 +1,13 @@
+ dnl Process this file with autoconf to produce a configure script.
+
+-AC_INIT(configure.in)
+-AM_INIT_AUTOMAKE(pnmixer, 0.6-dev)
+-AM_CONFIG_HEADER(config.h)
++AC_INIT([pnmixer], [0.6-dev])
++AM_INIT_AUTOMAKE
++AC_CONFIG_HEADERS(config.h)
+ AM_MAINTAINER_MODE
+
+-OLD_CFLAGS=$CFLAGS
+ AC_ISC_POSIX
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+-CFLAGS=$OLD_CXXFLAGS
+
+ pkg_modules="gtk+-2.0 >= 2.16.0"
+
+@@ -37,12 +34,13 @@
+
+ if test x"$debugit" = x"yes"; then
+ AC_DEFINE([DEBUG],[],[Debug Mode])
+- AM_CFLAGS="$AM_CFLAGS -g -Wall -Werror -Wno-uninitialized -Wformat -Wformat-security -O0 -export-dynamic"
+ else
+ AC_DEFINE([NDEBUG],[],[No-debug Mode])
+- AM_CFLAGS="$AM_CFLAGS -O2 -export-dynamic"
+ fi
+
++CFLAGS="$CFLAGS -Wall -Wno-uninitialized -Wformat -Wformat-security"
++LDFLAGS="-rdynamic $LDFLAGS"
++
+ ##########################################################################
+
+ # Make sure we have X11, and also have it added to LIBS
+@@ -74,7 +72,6 @@
+ AC_DEFINE([HAVE_LIBN],1,[Defined if you have libnotify])
+ fi
+
+-AC_SUBST([AM_CFLAGS])
+
+ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+ AC_SUBST(PACKAGE_CFLAGS)
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -1,6 +1,5 @@
+ ## Process this file with automake to produce Makefile.in
+
+-AM_CFLAGS = @AM_CFLAGS@
+
+ INCLUDES = \
+ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
diff --git a/media-sound/pnmixer/files/pnmixer-0.6_pre20111213-desktopfile.patch b/media-sound/pnmixer/files/pnmixer-0.6_pre20111213-desktopfile.patch
new file mode 100644
index 000000000000..992e02936477
--- /dev/null
+++ b/media-sound/pnmixer/files/pnmixer-0.6_pre20111213-desktopfile.patch
@@ -0,0 +1,15 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Fri Nov 16 00:03:56 UTC 2012
+Subject: desktop file
+
+ comply with fd.o spec
+
+--- data/pnmixer.desktop
++++ data/pnmixer.desktop
+@@ -12,4 +12,4 @@
+ Icon=pnmixer
+ Terminal=false
+ Type=Application
+-Categories=Application;AudioVideo;
+\ No newline at end of file
++Categories=AudioVideo;