From eccb70a7f91b2d22582587f26d1a28bb31408b45 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 18 May 2019 00:10:51 +0100 Subject: gentoo resync : 18.05.2019 --- .../files/7.2.0/bacula-7.2.0-fix-static.patch | 56 ------------------- .../files/9.0.2/bacula-9.0.2-fix-static.patch | 63 ---------------------- .../bacula-9.0.6-fix-pages-h-qt-includes.patch | 15 ------ 3 files changed, 134 deletions(-) delete mode 100644 app-backup/bacula/files/7.2.0/bacula-7.2.0-fix-static.patch delete mode 100644 app-backup/bacula/files/9.0.2/bacula-9.0.2-fix-static.patch delete mode 100644 app-backup/bacula/files/9.0.6/bacula-9.0.6-fix-pages-h-qt-includes.patch (limited to 'app-backup/bacula/files') diff --git a/app-backup/bacula/files/7.2.0/bacula-7.2.0-fix-static.patch b/app-backup/bacula/files/7.2.0/bacula-7.2.0-fix-static.patch deleted file mode 100644 index faf0d065b90f..000000000000 --- a/app-backup/bacula/files/7.2.0/bacula-7.2.0-fix-static.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- src/console/Makefile.in.orig 2011-10-30 14:10:41.100802721 -0400 -+++ src/console/Makefile.in 2011-10-30 14:14:42.330488174 -0400 -@@ -29,10 +29,11 @@ - GETTEXT_LIBS = @LIBINTL@ - - CONS_INC=@CONS_INC@ - CONS_LIBS=@CONS_LIBS@ - CONS_LDFLAGS=@CONS_LDFLAGS@ -+ZLIBS=@ZLIBS@ - - .SUFFIXES: .c .o - .PHONY: - .DONTCARE: - -@@ -46,17 +47,17 @@ - @echo " " - - - bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) - $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \ -- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ -- $(OPENSSL_LIBS) -+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \ -+ $(OPENSSL_LIBS) $(LIBS) - - static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) - $(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ -- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ -- $(OPENSSL_LIBS) -+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \ -+ $(OPENSSL_LIBS) $(LIBS) $(ZLIBS) - strip $@ - - - Makefile: $(srcdir)/Makefile.in $(topdir)/config.status - cd $(topdir) \ ---- src/filed/Makefile.in.orig 2015-09-04 12:47:13.000000000 +0200 -+++ src/filed/Makefile.in 2015-09-04 12:49:39.000000000 +0200 -@@ -66,13 +66,13 @@ - bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) - @echo "Linking $@ ..." - $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \ -- $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ -- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) -+ $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \ -+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) - - static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) - $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \ -- $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ -- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) -+ $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \ -+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) - strip $@ - - Makefile: $(srcdir)/Makefile.in $(topdir)/config.status diff --git a/app-backup/bacula/files/9.0.2/bacula-9.0.2-fix-static.patch b/app-backup/bacula/files/9.0.2/bacula-9.0.2-fix-static.patch deleted file mode 100644 index bf6630a74a29..000000000000 --- a/app-backup/bacula/files/9.0.2/bacula-9.0.2-fix-static.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- src/console/Makefile.in.orig 2017-07-25 19:03:05.664760298 +0200 -+++ src/console/Makefile.in 2017-07-25 19:05:43.576706091 +0200 -@@ -24,6 +24,7 @@ - CONSSRCS = console.c console_conf.c authenticate.c @CONS_SRC@ - CONSOBJS = console.o console_conf.o authenticate.o @CONS_OBJ@ - JSONOBJS = bbconsjson.o console_conf.o -+ZLIBS=@ZLIBS@ - - # these are the objects that are changed by the .configure process - EXTRAOBJS = @OBJLIST@ -@@ -50,18 +51,18 @@ - - bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) - $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \ -- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ -- $(OPENSSL_LIBS) -+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \ -+ $(OPENSSL_LIBS) $(LIBS) - - bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) - $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(JSONOBJS) \ -- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ -- $(OPENSSL_LIBS) -+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \ -+ $(OPENSSL_LIBS) $(LIBS) - - static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) - $(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \ -- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ -- $(OPENSSL_LIBS) -+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \ -+ $(OPENSSL_LIBS) $(LIBS) - strip $@ - - ---- src/filed/Makefile.in.orig 2017-07-25 19:09:19.655852979 +0200 -+++ src/filed/Makefile.in 2017-07-25 19:11:39.519558592 +0200 -@@ -69,19 +69,19 @@ - bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) - @echo "Linking $@ ..." - $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \ -- $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ -- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) -+ $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \ -+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) - - bfdjson: Makefile $(JSONOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ - @echo "Linking $@ ..." - $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(JSONOBJS) \ -- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ -- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) -+ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \ -+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) - - static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) - $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \ -- $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ -- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) -+ $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \ -+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) - strip $@ - - Makefile: $(srcdir)/Makefile.in $(topdir)/config.status diff --git a/app-backup/bacula/files/9.0.6/bacula-9.0.6-fix-pages-h-qt-includes.patch b/app-backup/bacula/files/9.0.6/bacula-9.0.6-fix-pages-h-qt-includes.patch deleted file mode 100644 index 9d6507c9c71a..000000000000 --- a/app-backup/bacula/files/9.0.6/bacula-9.0.6-fix-pages-h-qt-includes.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/qt-console/pages.h.orig 2017-11-21 12:37:16.000000000 -0500 -+++ src/qt-console/pages.h 2018-02-07 13:11:46.223273248 -0500 -@@ -20,10 +20,11 @@ - */ - /* - * Dirk Bartley, March 2007 - */ - -+#include - #if QT_VERSION >= 0x050000 - #include - #else - #include - #endif - -- cgit v1.2.3