summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com>2016-06-23 20:32:09 +0200
committerPatrice Clement <monsieurp@gentoo.org>2016-06-27 07:16:10 +0000
commit8c0bc7f7b3097d8d88c22b0171b33548c4360581 (patch)
tree7ae1abcba45d33fb1b0be11f160ddd802a5ce2fc /app-admin
parentapp-emulation/xen-pvgrub: version bump (diff)
downloadgentoo-8c0bc7f7b3097d8d88c22b0171b33548c4360581.tar.gz
gentoo-8c0bc7f7b3097d8d88c22b0171b33548c4360581.tar.bz2
gentoo-8c0bc7f7b3097d8d88c22b0171b33548c4360581.zip
app-admin/hardinfo: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/1730 Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/hardinfo/files/hardinfo-0.5.1-makefile.patch64
-rw-r--r--app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-build.patch53
-rw-r--r--app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-clang.patch24
-rw-r--r--app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-underlinking.patch16
4 files changed, 0 insertions, 157 deletions
diff --git a/app-admin/hardinfo/files/hardinfo-0.5.1-makefile.patch b/app-admin/hardinfo/files/hardinfo-0.5.1-makefile.patch
deleted file mode 100644
index d195c358d99..00000000000
--- a/app-admin/hardinfo/files/hardinfo-0.5.1-makefile.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sat May 26 01:30:39 UTC 2012
-Subject: build system
-
-respect CC and LDFLAGS
-
---- Makefile.in
-+++ Makefile.in
-@@ -1,8 +1,6 @@
-
--CCFLAGS = -fPIC -pipe -Wall -g
--CFLAGS = $(GTK_CFLAGS) $(SOUP_CFLAGS) -I.
--CC = gcc $(ARCHOPTS) -g
--CCSLOW = gcc -O0 -g
-+CFLAGS+=-fPIC $(GTK_CFLAGS) $(SOUP_CFLAGS) -I.
-+CC?=gcc
-
- # ----------------------------------------------------------------------------
-
-@@ -14,35 +12,35 @@
- MODULES = computer.so devices.so benchmark.so network.so
-
- all: $(OBJECTS) $(MODULES)
-- $(CC) $(CCFLAGS) -o hardinfo -Wl,-export-dynamic $(OBJECTS) $(GTK_LIBS) \
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o hardinfo -Wl,-export-dynamic $(OBJECTS) $(GTK_LIBS) \
- $(SOUP_LIBS)
-
- md5.o:
-- $(CCSLOW) $(CCFLAGS) $(CFLAGS) -c md5.c -o $@
-+ $(CC) $(CFLAGS) -c md5.c -o $@
-
- blowfish.o:
-- $(CCSLOW) $(CCFLAGS) $(CFLAGS) -c blowfish.c -o $@
-+ $(CC) $(CFLAGS) -c blowfish.c -o $@
-
- sha1.o:
-- $(CCSLOW) $(CCFLAGS) $(CFLAGS) -c sha1.c -o $@
-+ $(CC) $(CFLAGS) -c sha1.c -o $@
-
- fbench.o:
-- $(CCSLOW) $(CCFLAGS) $(CFLAGS) -c fbench.c -o $@
-+ $(CC) $(CFLAGS) -c fbench.c -o $@
-
- fftbench.o:
-- $(CCSLOW) $(CCFLAGS) $(CFLAGS) -c fftbench.c -o $@
-+ $(CC) $(CFLAGS) -c fftbench.c -o $@
-
- nqueens.o:
-- $(CCSLOW) $(CCFLAGS) $(CFLAGS) -c nqueens.c -o $@
-+ $(CC) $(CFLAGS) -c nqueens.c -o $@
-
- benchmark.so: benchmark.c
- make $(BENCHMARK_OBJECTS)
-- $(CCSLOW) $(CCFLAGS) $(CFLAGS) -o $@ -shared $< $(BENCHMARK_OBJECTS) \
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -shared $< $(BENCHMARK_OBJECTS) \
- $(GTK_FLAGS) $(GTK_LIBS)
- ln -sf ../$@ modules
-
- %.so: %.c
-- $(CC) $(CCFLAGS) $(CFLAGS) -o $@ -shared $< $(GTK_FLAGS) $(GTK_LIBS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -shared $< $(GTK_FLAGS) $(GTK_LIBS)
- ln -sf ../$@ modules
-
- clean:
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
deleted file mode 100644
index 76718a38ebd..00000000000
--- a/app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-build.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sat May 26 01:30:39 UTC 2012
-Subject: build system
-
-use GNUInstallDirs and respect lib suffix
-
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -3,6 +3,8 @@
-
- set(HARDINFO_VERSION "0.5.2pre")
-
-+include(GNUInstallDirs)
-+
- if(${CMAKE_BUILD_TYPE} MATCHES "Debug")
- set(HARDINFO_DEBUG 1)
- endif()
-@@ -179,8 +181,8 @@
- configure_file(hardinfo.desktop.cmake ${CMAKE_BINARY_DIR}/hardinfo.desktop @ONLY)
-
- install(TARGETS hardinfo ${HARDINFO_MODULES}
-- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib/hardinfo/modules
-+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/hardinfo/modules
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- )
- install(FILES ${CMAKE_BINARY_DIR}/hardinfo.desktop
-@@ -201,4 +203,4 @@
- PATTERN "*.{hlp,png}"
- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
- )
--
-\ No newline at end of file
-+
---- config.h.cmake
-+++ config.h.cmake
-@@ -10,7 +10,7 @@
- #define HOSTNAME ""
- #define ARCH_@HARDINFO_ARCH@
-
--#define LIBPREFIX "@CMAKE_INSTALL_PREFIX@/lib/hardinfo"
-+#define LIBPREFIX "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/hardinfo"
- #define PREFIX "@CMAKE_INSTALL_PREFIX@/share/hardinfo"
-
- #cmakedefine LIBSOUP_FOUND
-@@ -32,4 +32,4 @@
- #define ENABLE_BINRELOC 1
- #define HAS_LINUX_WE 1
-
--#endif /* __CONFIG_H__ */
-\ No newline at end of file
-+#endif /* __CONFIG_H__ */
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
deleted file mode 100644
index bc81290b227..00000000000
--- a/app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-clang.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://github.com/lpereira/hardinfo/pull/6
-
---- hardinfo-0.5.2_pre20120527/hardinfo/util.c
-+++ hardinfo-0.5.2_pre20120527/hardinfo/util.c
-@@ -1368,7 +1368,7 @@
- {
- if (G_UNLIKELY(!_moreinfo)) {
- DEBUG("moreinfo not initialized");
-- return;
-+ return 0;
- }
-
- if (prefix) {
---- hardinfo-0.5.2_pre20120527/CMakeLists.txt
-+++ hardinfo-0.5.2_pre20120527/CMakeLists.txt
-@@ -43,6 +43,8 @@
-
- message(STATUS "Building HardInfo for architecture: ${HARDINFO_OS}-${HARDINFO_ARCH}")
-
-+add_definitions("-std=gnu89")
-+
- include(FindPkgConfig)
- 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)
- pkg_check_modules(LIBSOUP libsoup-2.4>=2.24)
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
deleted file mode 100644
index b726c505593..00000000000
--- a/app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-underlinking.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: Slawomir Nizio <slawomir.nizio@sabayon.org>
-Date: Tue May 29 11:52:00 UTC 2012
-Subject: build system
-
-fix underlinking wrt https://bugs.gentoo.org/show_bug.cgi?id=418121
-
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -171,6 +171,7 @@
- ${GTK_LIBRARIES}
- ${LIBSOUP_LIBRARIES}
- hardinfo-shell
-+ m
- )
- target_link_libraries(hardinfo-shell
- hardinfo-help-viewer