Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libgrss/files/
Date: Thu, 09 Feb 2017 00:00:43
Message-Id: 1486598432.f748406b2a9f3413af2c8dfc000722dab89689ec.monsieurp@gentoo
1 commit: f748406b2a9f3413af2c8dfc000722dab89689ec
2 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 8 23:58:49 2017 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 9 00:00:32 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f748406b
7
8 net-libs/libgrss: remove unused patch.
9
10 Package-Manager: portage-2.3.3
11
12 .../libgrss/files/libgrss-0.3.0-fix-slotting.patch | 125 ---------------------
13 1 file changed, 125 deletions(-)
14
15 diff --git a/net-libs/libgrss/files/libgrss-0.3.0-fix-slotting.patch b/net-libs/libgrss/files/libgrss-0.3.0-fix-slotting.patch
16 deleted file mode 100644
17 index a63ebb393b..0000000000
18 --- a/net-libs/libgrss/files/libgrss-0.3.0-fix-slotting.patch
19 +++ /dev/null
20 @@ -1,125 +0,0 @@
21 -From 3023bfdf7a8b6a1df13b8b937c60ee7c4bd1d9ae Mon Sep 17 00:00:00 2001
22 -From: Gilles Dartiguelongue <eva@g.o>
23 -Date: Mon, 1 Apr 2013 16:07:21 +0200
24 -Subject: [PATCH] Fix parallel installation for API version 0
25 -
26 ----
27 - Makefile.am | 6 ++++--
28 - configure.ac | 3 +++
29 - doc/reference/Makefile.am | 4 ++--
30 - libgrss.pc.in | 4 ++--
31 - src/Makefile.am | 12 ++++++------
32 - 5 files changed, 17 insertions(+), 12 deletions(-)
33 -
34 -diff --git a/Makefile.am b/Makefile.am
35 -index effacb1..b4a53e1 100644
36 ---- a/Makefile.am
37 -+++ b/Makefile.am
38 -@@ -1,11 +1,13 @@
39 - ACLOCAL_AMFLAGS = -I m4
40 - SUBDIRS = src doc
41 - EXTRA_DIST = autogen.sh
42 -+CLEANFILES = libgrss-$(LIBGRSS_API_VERSION).pc
43 -
44 - pcfiledir = $(libdir)/pkgconfig
45 --pcfile_DATA = libgrss-0.pc
46 -+
47 -+pcfile_DATA = libgrss-$(LIBGRSS_API_VERSION).pc
48 -
49 - DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
50 -
51 --libgrss-0.pc: libgrss.pc
52 -+libgrss-$(LIBGRSS_API_VERSION).pc: libgrss.pc
53 - @cp -f $< $@
54 -diff --git a/configure.ac b/configure.ac
55 -index 64fe542..e036df6 100644
56 ---- a/configure.ac
57 -+++ b/configure.ac
58 -@@ -1,6 +1,7 @@
59 - m4_define([libgrss_major_version], [0])
60 - m4_define([libgrss_minor_version], [3])
61 - m4_define([libgrss_micro_version], [0])
62 -+m4_define([libgrss_api_version], [0])
63 -
64 - m4_define([libgrss_version],
65 - [libgrss_major_version.libgrss_minor_version.libgrss_micro_version])
66 -@@ -46,10 +47,12 @@ AC_CHECK_FUNCS([strptime localtime_r])
67 - LIBGRSS_MAJOR_VERSION=libgrss_major_version
68 - LIBGRSS_MINOR_VERSION=libgrss_minor_version
69 - LIBGRSS_MICRO_VERSION=libgrss_micro_version
70 -+LIBGRSS_API_VERSION=libgrss_api_version
71 - LIBGRSS_VERSION=libgrss_version
72 - AC_SUBST(LIBGRSS_MAJOR_VERSION)
73 - AC_SUBST(LIBGRSS_MICRO_VERSION)
74 - AC_SUBST(LIBGRSS_MINOR_VERSION)
75 -+AC_SUBST(LIBGRSS_API_VERSION)
76 - AC_SUBST(LIBGRSS_VERSION)
77 -
78 - dnl libgrss checks
79 -diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
80 -index 644642d..eafbc65 100644
81 ---- a/doc/reference/Makefile.am
82 -+++ b/doc/reference/Makefile.am
83 -@@ -7,7 +7,7 @@ AUTOMAKE_OPTIONS = 1.6
84 - # of using the various options.
85 -
86 - # The name of the module, e.g. 'glib'.
87 --DOC_MODULE=libgrss
88 -+DOC_MODULE=libgrss-@LIBGRSS_API_VERSION@
89 -
90 - # The top-level SGML file. You can change this if you want to.
91 - DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
92 -@@ -71,7 +71,7 @@ expand_content_files=
93 - # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
94 -
95 - INCLUDES=-I$(top_srcdir) $(LIBGRSS_CFLAGS)
96 --GTKDOC_LIBS=$(top_builddir)/src/libgrss-1.0.la $(LIBGRSS_LIBS)
97 -+GTKDOC_LIBS=$(top_builddir)/src/libgrss-@LIBGRSS_API_VERSION@.la $(LIBGRSS_LIBS)
98 -
99 - # This includes the standard gtk-doc make rules, copied by gtkdocize.
100 - include $(top_srcdir)/gtk-doc.make
101 -diff --git a/libgrss.pc.in b/libgrss.pc.in
102 -index 2ce65c9..5d4e1b0 100644
103 ---- a/libgrss.pc.in
104 -+++ b/libgrss.pc.in
105 -@@ -6,6 +6,6 @@ includedir=${exec_prefix}/include
106 - Name: libgrss
107 - Description: GObject RSS handling library
108 - Version: @VERSION@
109 --Libs: -L${libdir} -lgrss-1.0
110 --Cflags: -I${includedir}/libgrss
111 -+Libs: -L${libdir} -lgrss-@LIBGRSS_API_VERSION@
112 -+Cflags: -I${includedir}/libgrss-@LIBGRSS_API_VERSION@
113 - Requires: gobject-2.0 libxml-2.0 libsoup-2.4
114 -diff --git a/src/Makefile.am b/src/Makefile.am
115 -index 93c9be7..ee48a16 100644
116 ---- a/src/Makefile.am
117 -+++ b/src/Makefile.am
118 -@@ -56,18 +56,18 @@ feed-marshal.c: feed-marshal.list
119 - echo "#include \"feed-marshal.h\"" > $@ && \
120 - $(GLIB_GENMARSHAL) $< --prefix=feed_marshal --body >> $@
121 -
122 --lib_LTLIBRARIES = libgrss-1.0.la
123 -+lib_LTLIBRARIES = libgrss-0.la
124 -
125 --libgrss_1_0_la_LIBADD = $(LIBGRSS_LIBS)
126 --libgrss_1_0_la_SOURCES = \
127 -+libgrss_0_la_LIBADD = $(LIBGRSS_LIBS)
128 -+libgrss_0_la_SOURCES = \
129 - $(sources_public_h) \
130 - $(sources_private_h) \
131 - $(sources_c) \
132 - $(NULL)
133 --libgrss_1_0_la_LDFLAGS = $(LDADD)
134 -+libgrss_0_la_LDFLAGS = $(LDADD)
135 -
136 --libgrssincludedir = $(includedir)/libgrss
137 --libgrssinclude_DATA = $(sources_public_h)
138 -+libgrss_0_ladir = $(includedir)/libgrss-@LIBGRSS_API_VERSION@
139 -+libgrss_0_la_HEADERS = $(sources_public_h)
140 -
141 - CLEANFILES = $(pcfile_DATA)
142 -
143 ---
144 -1.8.1.5
145 -