Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/hardinfo/files/
Date: Mon, 27 Jun 2016 07:44:14
Message-Id: 1467011770.8c0bc7f7b3097d8d88c22b0171b33548c4360581.monsieurp@gentoo
1 commit: 8c0bc7f7b3097d8d88c22b0171b33548c4360581
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Thu Jun 23 18:32:09 2016 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 27 07:16:10 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c0bc7f7
7
8 app-admin/hardinfo: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/1730
11
12 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
13
14 .../hardinfo/files/hardinfo-0.5.1-makefile.patch | 64 ----------------------
15 .../files/hardinfo-0.5.2_pre20120527-build.patch | 53 ------------------
16 .../files/hardinfo-0.5.2_pre20120527-clang.patch | 24 --------
17 .../hardinfo-0.5.2_pre20120527-underlinking.patch | 16 ------
18 4 files changed, 157 deletions(-)
19
20 diff --git a/app-admin/hardinfo/files/hardinfo-0.5.1-makefile.patch b/app-admin/hardinfo/files/hardinfo-0.5.1-makefile.patch
21 deleted file mode 100644
22 index d195c35..0000000
23 --- a/app-admin/hardinfo/files/hardinfo-0.5.1-makefile.patch
24 +++ /dev/null
25 @@ -1,64 +0,0 @@
26 -From: Julian Ospald <hasufell@g.o>
27 -Date: Sat May 26 01:30:39 UTC 2012
28 -Subject: build system
29 -
30 -respect CC and LDFLAGS
31 -
32 ---- Makefile.in
33 -+++ Makefile.in
34 -@@ -1,8 +1,6 @@
35 -
36 --CCFLAGS = -fPIC -pipe -Wall -g
37 --CFLAGS = $(GTK_CFLAGS) $(SOUP_CFLAGS) -I.
38 --CC = gcc $(ARCHOPTS) -g
39 --CCSLOW = gcc -O0 -g
40 -+CFLAGS+=-fPIC $(GTK_CFLAGS) $(SOUP_CFLAGS) -I.
41 -+CC?=gcc
42 -
43 - # ----------------------------------------------------------------------------
44 -
45 -@@ -14,35 +12,35 @@
46 - MODULES = computer.so devices.so benchmark.so network.so
47 -
48 - all: $(OBJECTS) $(MODULES)
49 -- $(CC) $(CCFLAGS) -o hardinfo -Wl,-export-dynamic $(OBJECTS) $(GTK_LIBS) \
50 -+ $(CC) $(CFLAGS) $(LDFLAGS) -o hardinfo -Wl,-export-dynamic $(OBJECTS) $(GTK_LIBS) \
51 - $(SOUP_LIBS)
52 -
53 - md5.o:
54 -- $(CCSLOW) $(CCFLAGS) $(CFLAGS) -c md5.c -o $@
55 -+ $(CC) $(CFLAGS) -c md5.c -o $@
56 -
57 - blowfish.o:
58 -- $(CCSLOW) $(CCFLAGS) $(CFLAGS) -c blowfish.c -o $@
59 -+ $(CC) $(CFLAGS) -c blowfish.c -o $@
60 -
61 - sha1.o:
62 -- $(CCSLOW) $(CCFLAGS) $(CFLAGS) -c sha1.c -o $@
63 -+ $(CC) $(CFLAGS) -c sha1.c -o $@
64 -
65 - fbench.o:
66 -- $(CCSLOW) $(CCFLAGS) $(CFLAGS) -c fbench.c -o $@
67 -+ $(CC) $(CFLAGS) -c fbench.c -o $@
68 -
69 - fftbench.o:
70 -- $(CCSLOW) $(CCFLAGS) $(CFLAGS) -c fftbench.c -o $@
71 -+ $(CC) $(CFLAGS) -c fftbench.c -o $@
72 -
73 - nqueens.o:
74 -- $(CCSLOW) $(CCFLAGS) $(CFLAGS) -c nqueens.c -o $@
75 -+ $(CC) $(CFLAGS) -c nqueens.c -o $@
76 -
77 - benchmark.so: benchmark.c
78 - make $(BENCHMARK_OBJECTS)
79 -- $(CCSLOW) $(CCFLAGS) $(CFLAGS) -o $@ -shared $< $(BENCHMARK_OBJECTS) \
80 -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -shared $< $(BENCHMARK_OBJECTS) \
81 - $(GTK_FLAGS) $(GTK_LIBS)
82 - ln -sf ../$@ modules
83 -
84 - %.so: %.c
85 -- $(CC) $(CCFLAGS) $(CFLAGS) -o $@ -shared $< $(GTK_FLAGS) $(GTK_LIBS)
86 -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -shared $< $(GTK_FLAGS) $(GTK_LIBS)
87 - ln -sf ../$@ modules
88 -
89 - clean:
90
91 diff --git a/app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-build.patch b/app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-build.patch
92 deleted file mode 100644
93 index 76718a3..0000000
94 --- a/app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-build.patch
95 +++ /dev/null
96 @@ -1,53 +0,0 @@
97 -From: Julian Ospald <hasufell@g.o>
98 -Date: Sat May 26 01:30:39 UTC 2012
99 -Subject: build system
100 -
101 -use GNUInstallDirs and respect lib suffix
102 -
103 ---- CMakeLists.txt
104 -+++ CMakeLists.txt
105 -@@ -3,6 +3,8 @@
106 -
107 - set(HARDINFO_VERSION "0.5.2pre")
108 -
109 -+include(GNUInstallDirs)
110 -+
111 - if(${CMAKE_BUILD_TYPE} MATCHES "Debug")
112 - set(HARDINFO_DEBUG 1)
113 - endif()
114 -@@ -179,8 +181,8 @@
115 - configure_file(hardinfo.desktop.cmake ${CMAKE_BINARY_DIR}/hardinfo.desktop @ONLY)
116 -
117 - install(TARGETS hardinfo ${HARDINFO_MODULES}
118 -- RUNTIME DESTINATION bin
119 -- LIBRARY DESTINATION lib/hardinfo/modules
120 -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
121 -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/hardinfo/modules
122 - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
123 - )
124 - install(FILES ${CMAKE_BINARY_DIR}/hardinfo.desktop
125 -@@ -201,4 +203,4 @@
126 - PATTERN "*.{hlp,png}"
127 - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
128 - )
129 --
130 -\ No newline at end of file
131 -+
132 ---- config.h.cmake
133 -+++ config.h.cmake
134 -@@ -10,7 +10,7 @@
135 - #define HOSTNAME ""
136 - #define ARCH_@HARDINFO_ARCH@
137 -
138 --#define LIBPREFIX "@CMAKE_INSTALL_PREFIX@/lib/hardinfo"
139 -+#define LIBPREFIX "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/hardinfo"
140 - #define PREFIX "@CMAKE_INSTALL_PREFIX@/share/hardinfo"
141 -
142 - #cmakedefine LIBSOUP_FOUND
143 -@@ -32,4 +32,4 @@
144 - #define ENABLE_BINRELOC 1
145 - #define HAS_LINUX_WE 1
146 -
147 --#endif /* __CONFIG_H__ */
148 -\ No newline at end of file
149 -+#endif /* __CONFIG_H__ */
150
151 diff --git a/app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-clang.patch b/app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-clang.patch
152 deleted file mode 100644
153 index bc81290..0000000
154 --- a/app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-clang.patch
155 +++ /dev/null
156 @@ -1,24 +0,0 @@
157 -https://github.com/lpereira/hardinfo/pull/6
158 -
159 ---- hardinfo-0.5.2_pre20120527/hardinfo/util.c
160 -+++ hardinfo-0.5.2_pre20120527/hardinfo/util.c
161 -@@ -1368,7 +1368,7 @@
162 - {
163 - if (G_UNLIKELY(!_moreinfo)) {
164 - DEBUG("moreinfo not initialized");
165 -- return;
166 -+ return 0;
167 - }
168 -
169 - if (prefix) {
170 ---- hardinfo-0.5.2_pre20120527/CMakeLists.txt
171 -+++ hardinfo-0.5.2_pre20120527/CMakeLists.txt
172 -@@ -43,6 +43,8 @@
173 -
174 - message(STATUS "Building HardInfo for architecture: ${HARDINFO_OS}-${HARDINFO_ARCH}")
175 -
176 -+add_definitions("-std=gnu89")
177 -+
178 - include(FindPkgConfig)
179 - pkg_check_modules(GTK REQUIRED gtk+-2.0>=2.10 glib-2.0>=2.10 gthread-2.0>=2.10 gmodule-export-2.0>=2.10)
180 - pkg_check_modules(LIBSOUP libsoup-2.4>=2.24)
181
182 diff --git a/app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-underlinking.patch b/app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-underlinking.patch
183 deleted file mode 100644
184 index b726c50..0000000
185 --- a/app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-underlinking.patch
186 +++ /dev/null
187 @@ -1,16 +0,0 @@
188 -From: Slawomir Nizio <slawomir.nizio@×××××××.org>
189 -Date: Tue May 29 11:52:00 UTC 2012
190 -Subject: build system
191 -
192 -fix underlinking wrt https://bugs.gentoo.org/show_bug.cgi?id=418121
193 -
194 ---- CMakeLists.txt
195 -+++ CMakeLists.txt
196 -@@ -171,6 +171,7 @@
197 - ${GTK_LIBRARIES}
198 - ${LIBSOUP_LIBRARIES}
199 - hardinfo-shell
200 -+ m
201 - )
202 - target_link_libraries(hardinfo-shell
203 - hardinfo-help-viewer
Report Message
Find on MARC Find on Google Groups