Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/pnmixer/files/
Date: Fri, 21 Sep 2018 10:20:56
Message-Id: 1537525237.97963c3b55259c1f408178abe7515f5d7ecf4342.asturm@gentoo
1 commit: 97963c3b55259c1f408178abe7515f5d7ecf4342
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed Sep 19 17:31:46 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 21 10:20:37 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97963c3b
7
8 media-sound/pnmixer: remove unused patch(es)
9
10 Closes: https://github.com/gentoo/gentoo/pull/9917
11
12 .../files/pnmixer-0.6_pre20111213-build.patch | 63 ----------------------
13 .../pnmixer-0.6_pre20111213-desktopfile.patch | 15 ------
14 2 files changed, 78 deletions(-)
15
16 diff --git a/media-sound/pnmixer/files/pnmixer-0.6_pre20111213-build.patch b/media-sound/pnmixer/files/pnmixer-0.6_pre20111213-build.patch
17 deleted file mode 100644
18 index 5e4fba2d075..00000000000
19 --- a/media-sound/pnmixer/files/pnmixer-0.6_pre20111213-build.patch
20 +++ /dev/null
21 @@ -1,63 +0,0 @@
22 -From: Julian Ospald <hasufell@g.o>
23 -Date: Thu Nov 15 23:59:49 UTC 2012
24 -Subject: build system
25 -
26 -respect CFLAGS, use rdynamic
27 -don't use AM_CFLAGS in configure.in
28 -fix macros for automake-1.13
29 -
30 ---- configure.in
31 -+++ configure.in
32 -@@ -1,16 +1,13 @@
33 - dnl Process this file with autoconf to produce a configure script.
34 -
35 --AC_INIT(configure.in)
36 --AM_INIT_AUTOMAKE(pnmixer, 0.6-dev)
37 --AM_CONFIG_HEADER(config.h)
38 -+AC_INIT([pnmixer], [0.6-dev])
39 -+AM_INIT_AUTOMAKE
40 -+AC_CONFIG_HEADERS(config.h)
41 - AM_MAINTAINER_MODE
42 -
43 --OLD_CFLAGS=$CFLAGS
44 - AC_ISC_POSIX
45 - AC_PROG_CC
46 --AM_PROG_CC_STDC
47 - AC_HEADER_STDC
48 --CFLAGS=$OLD_CXXFLAGS
49 -
50 - pkg_modules="gtk+-2.0 >= 2.16.0"
51 -
52 -@@ -37,12 +34,13 @@
53 -
54 - if test x"$debugit" = x"yes"; then
55 - AC_DEFINE([DEBUG],[],[Debug Mode])
56 -- AM_CFLAGS="$AM_CFLAGS -g -Wall -Werror -Wno-uninitialized -Wformat -Wformat-security -O0 -export-dynamic"
57 - else
58 - AC_DEFINE([NDEBUG],[],[No-debug Mode])
59 -- AM_CFLAGS="$AM_CFLAGS -O2 -export-dynamic"
60 - fi
61 -
62 -+CFLAGS="$CFLAGS -Wall -Wno-uninitialized -Wformat -Wformat-security"
63 -+LDFLAGS="-rdynamic $LDFLAGS"
64 -+
65 - ##########################################################################
66 -
67 - # Make sure we have X11, and also have it added to LIBS
68 -@@ -74,7 +72,6 @@
69 - AC_DEFINE([HAVE_LIBN],1,[Defined if you have libnotify])
70 - fi
71 -
72 --AC_SUBST([AM_CFLAGS])
73 -
74 - PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
75 - AC_SUBST(PACKAGE_CFLAGS)
76 ---- src/Makefile.am
77 -+++ src/Makefile.am
78 -@@ -1,6 +1,5 @@
79 - ## Process this file with automake to produce Makefile.in
80 -
81 --AM_CFLAGS = @AM_CFLAGS@
82 -
83 - INCLUDES = \
84 - -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
85
86 diff --git a/media-sound/pnmixer/files/pnmixer-0.6_pre20111213-desktopfile.patch b/media-sound/pnmixer/files/pnmixer-0.6_pre20111213-desktopfile.patch
87 deleted file mode 100644
88 index 992e0293647..00000000000
89 --- a/media-sound/pnmixer/files/pnmixer-0.6_pre20111213-desktopfile.patch
90 +++ /dev/null
91 @@ -1,15 +0,0 @@
92 -From: Julian Ospald <hasufell@g.o>
93 -Date: Fri Nov 16 00:03:56 UTC 2012
94 -Subject: desktop file
95 -
96 - comply with fd.o spec
97 -
98 ---- data/pnmixer.desktop
99 -+++ data/pnmixer.desktop
100 -@@ -12,4 +12,4 @@
101 - Icon=pnmixer
102 - Terminal=false
103 - Type=Application
104 --Categories=Application;AudioVideo;
105 -\ No newline at end of file
106 -+Categories=AudioVideo;