diff options
author | 2015-08-08 13:49:04 -0700 | |
---|---|---|
committer | 2015-08-08 17:38:18 -0700 | |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-gfx/iscan/files/iscan-2.25.0-drop-ltdl.patch | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-gfx/iscan/files/iscan-2.25.0-drop-ltdl.patch')
-rw-r--r-- | media-gfx/iscan/files/iscan-2.25.0-drop-ltdl.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/media-gfx/iscan/files/iscan-2.25.0-drop-ltdl.patch b/media-gfx/iscan/files/iscan-2.25.0-drop-ltdl.patch new file mode 100644 index 000000000000..8ac18defc007 --- /dev/null +++ b/media-gfx/iscan/files/iscan-2.25.0-drop-ltdl.patch @@ -0,0 +1,64 @@ +diff -Naur iscan-2.25.0.orig//backend/Makefile.am iscan-2.25.0/backend/Makefile.am +--- iscan-2.25.0.orig//backend/Makefile.am 2010-05-19 07:51:55.000000000 +0200 ++++ iscan-2.25.0/backend/Makefile.am 2010-07-21 22:49:08.579705272 +0200 +@@ -56,7 +56,6 @@ + + libepkowa_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ +- $(LTDLINCL) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/non-free \ + $(XML_CFLAGS) \ +@@ -66,7 +65,7 @@ + libepkowa_la_LIBADD = \ + -lm \ + $(XML_LIBS) \ +- $(LIBLTDL) ++ -lltdl + libepkowa_la_SOURCES = \ + $(sane_backends_files) \ + marshal.c \ +diff -Naur iscan-2.25.0.orig//configure.ac iscan-2.25.0/configure.ac +--- iscan-2.25.0.orig//configure.ac 2010-07-21 22:48:11.411332268 +0200 ++++ iscan-2.25.0/configure.ac 2010-07-21 22:49:58.918332411 +0200 +@@ -261,13 +261,10 @@ + dnl The somewhat obscure LT_AC_PROG_SED is here to make sure that the + dnl SED environment variable gets set before it's used by the libtool + dnl machinery. This works around buggy libtool versions. +-LT_AC_PROG_SED +-AC_LIBLTDL_INSTALLABLE +-AC_LIBTOOL_DLOPEN + AC_PROG_LIBTOOL +-AC_LIB_LTDL +-AC_SUBST(LTDLINCL) +-AC_SUBST(LIBLTDL) ++AC_LTDL_SHLIBPATH ++AC_LTDL_SHLIBEXT ++AC_LTDL_SYSSEARCHPATH + + + dnl Graphic file format options +diff -Naur iscan-2.25.0.orig//frontend/Makefile.am iscan-2.25.0/frontend/Makefile.am +--- iscan-2.25.0.orig//frontend/Makefile.am 2010-05-19 07:51:54.000000000 +0200 ++++ iscan-2.25.0/frontend/Makefile.am 2010-07-21 22:50:53.965581385 +0200 +@@ -34,7 +34,7 @@ + iscan_LDADD = \ + $(top_builddir)/lib/libimage-stream.la \ + -lsane \ +- @LIBLTDL@ \ ++ -lltdl \ + @GTK_LIBS@ \ + @GDK_IMLIB_LIBS@ \ + $(top_builddir)/non-free/libesmod.so +diff -Naur iscan-2.25.0.orig//lib/Makefile.am iscan-2.25.0/lib/Makefile.am +--- iscan-2.25.0.orig//lib/Makefile.am 2010-05-19 07:51:56.000000000 +0200 ++++ iscan-2.25.0/lib/Makefile.am 2010-07-21 22:51:29.794329919 +0200 +@@ -29,7 +29,7 @@ + libimage_stream_la_CPPFLAGS = -I$(top_srcdir)/include + libimage_stream_la_LDFLAGS = -static + libimage_stream_la_LIBADD = \ +- $(LIBLTDL) \ ++ -lltdl \ + $(top_builddir)/lib/pdf/libpdf.la + libimage_stream_la_SOURCES = \ + $(libimage_stream_la_files) |