diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-03-12 20:50:29 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-03-13 10:33:25 +0100 |
| commit | 7d9eacdfc758857f89923f5b57e9f1b795186dd4 (patch) | |
| tree | acd4b4452bdecacc05be8c813a18c44a4576cf81 /sci-libs/silo/files | |
| parent | media-libs/libextractor: Non-maintainer security cleanup (diff) | |
| download | gentoo-7d9eacdfc758857f89923f5b57e9f1b795186dd4.tar.gz gentoo-7d9eacdfc758857f89923f5b57e9f1b795186dd4.tar.bz2 gentoo-7d9eacdfc758857f89923f5b57e9f1b795186dd4.zip | |
sci-libs/silo: Drop old
Closes: https://bugs.gentoo.org/645434
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'sci-libs/silo/files')
| -rw-r--r-- | sci-libs/silo/files/silo-4.9.1-qtlibs.patch | 66 | ||||
| -rw-r--r-- | sci-libs/silo/files/silo-4.9.1-tests.patch | 11 |
2 files changed, 0 insertions, 77 deletions
diff --git a/sci-libs/silo/files/silo-4.9.1-qtlibs.patch b/sci-libs/silo/files/silo-4.9.1-qtlibs.patch deleted file mode 100644 index e8fc4284cac0..000000000000 --- a/sci-libs/silo/files/silo-4.9.1-qtlibs.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -ru silo-4.9.1-old/configure silo-4.9.1-new/configure ---- silo-4.9.1-old/configure 2014-01-18 23:19:15.755030306 +0100 -+++ silo-4.9.1-new/configure 2014-01-18 23:20:52.595031159 +0100 -@@ -27503,7 +27503,7 @@ - ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p | - sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`" - fi -- ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" -+ ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" - else - # Use cached value or do search, starting with suggestions from - # the command line -@@ -27577,7 +27577,7 @@ - ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p | - sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`" - fi -- ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" -+ ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" - else - # There is no valid definition for $QTDIR as Trolltech likes to see it - ax_qt_dir= -@@ -27589,7 +27589,7 @@ - ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p | - sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`" - fi -- ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" -+ ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" - else - # Normally, when there is no traditional Trolltech installation, - # the library is installed in a place where the linker finds it -@@ -27607,7 +27607,7 @@ - # See if we find the library without any special options. - # Don't add top $LIBS permanently yet - ax_save_LIBS="$LIBS" -- LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" -+ LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" - ax_qt_LIBS="$LIBS" - ax_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui" -@@ -27668,7 +27668,7 @@ - # That did not work. Try the multi-threaded version - echo "Non-critical error, please neglect the above." >&5 - ax_qt_lib=qt-mt -- LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" -+ LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -27726,7 +27726,7 @@ - # That did not work. Try the OpenGL version - echo "Non-critical error, please neglect the above." >&5 - ax_qt_lib=qt-gl -- LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" -+ LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -27809,7 +27809,7 @@ - fi - done - # Try with that one -- LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" -+ LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF diff --git a/sci-libs/silo/files/silo-4.9.1-tests.patch b/sci-libs/silo/files/silo-4.9.1-tests.patch deleted file mode 100644 index 2e0a52191d0e..000000000000 --- a/sci-libs/silo/files/silo-4.9.1-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tests/Makefile.in.old 2014-07-24 07:25:53.464381420 +0200 -+++ tests/Makefile.in 2014-07-24 07:26:14.951048323 +0200 -@@ -169,7 +169,7 @@ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(ioperf_stdio_la_LDFLAGS) $(LDFLAGS) -o $@ - rocket_silo_la_LIBADD = --am_rocket_silo_la_OBJECTS = rocket_silo.lo -+am_rocket_silo_la_OBJECTS = rocket_silo.lo ../src/.libs/libsilo.la - rocket_silo_la_OBJECTS = $(am_rocket_silo_la_OBJECTS) - rocket_silo_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ |