libextractor.patch 6.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236
  1. Index: configure
  2. --- configure.orig 2006-11-12 05:56:28 +0100
  3. +++ configure 2006-11-12 09:58:43 +0100
  4. @@ -35550,8 +35550,3 @@
  5. { (exit 1); exit 1; }; }
  6. fi
  7. -if test "x$HAVE_MPEG2_TRUE" = "x#"
  8. -then
  9. - { echo "$as_me:$LINENO: NOTICE: libmpeg2 not found" >&5
  10. -echo "$as_me: NOTICE: libmpeg2 not found" >&6;}
  11. -fi
  12. Index: src/main/Makefile.in
  13. --- src/main/Makefile.in.orig 2006-11-12 05:56:22 +0100
  14. +++ src/main/Makefile.in 2006-11-12 09:59:41 +0100
  15. @@ -72,6 +72,7 @@
  16. getopt1.$(OBJEXT)
  17. extract_OBJECTS = $(am_extract_OBJECTS)
  18. extract_DEPENDENCIES = $(top_builddir)/src/main/libextractor.la
  19. +extract_LDFLAGS = -static
  20. am_test_binary_OBJECTS = test_binary.$(OBJEXT)
  21. test_binary_OBJECTS = $(am_test_binary_OBJECTS)
  22. test_binary_DEPENDENCIES = $(top_builddir)/src/main/libextractor.la
  23. @@ -286,7 +287,8 @@
  24. libextractor.la
  25. extract_LDADD = \
  26. - $(top_builddir)/src/main/libextractor.la
  27. + $(top_builddir)/src/main/libextractor.la \
  28. + $(top_builddir)/libltdl/libltdl.la
  29. @MINGW_FALSE@@SOMEBSD_FALSE@dlflag = -ldl
  30. @HAVE_ZLIB_TRUE@zlib = -lz
  31. Index: src/plugins/Makefile.in
  32. --- src/plugins/Makefile.in.orig 2006-11-12 05:56:23 +0100
  33. +++ src/plugins/Makefile.in 2006-11-12 10:00:14 +0100
  34. @@ -111,7 +111,7 @@
  35. libextractor_mp3_la_OBJECTS = $(am_libextractor_mp3_la_OBJECTS)
  36. libextractor_mpeg_la_DEPENDENCIES =
  37. am__libextractor_mpeg_la_SOURCES_DIST = mpegextractor.c
  38. -@HAVE_MPEG2_TRUE@am_libextractor_mpeg_la_OBJECTS = mpegextractor.lo
  39. +@HAVE_MPEG2_TRUE@am_libextractor_mpeg_la_OBJECTS =
  40. libextractor_mpeg_la_OBJECTS = $(am_libextractor_mpeg_la_OBJECTS)
  41. libextractor_nsf_la_DEPENDENCIES = \
  42. $(top_builddir)/src/main/libextractor.la
  43. @@ -365,12 +365,12 @@
  44. LDFLAGS = @LDFLAGS@
  45. LIBADD_DL = @LIBADD_DL@
  46. LIBEXT = @LIBEXT@
  47. -LIBICONV = @LIBICONV@
  48. +LIBICONV =
  49. LIBINTL = @LIBINTL@
  50. LIBLTDL = @LIBLTDL@
  51. LIBOBJS = @LIBOBJS@
  52. LIBS = \
  53. - @LTLIBINTL@ @LIBS@
  54. + @LIBS@
  55. LIBTOOL = @LIBTOOL@
  56. LN_S = @LN_S@
  57. @@ -1280,21 +1280,6 @@
  58. install-exec-hook:
  59. - mkdir -p $(DESTDIR)$(plugindir) &> /dev/null || true
  60. - rm -f $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
  61. - rm -f $(DESTDIR)$(plugindir)/libextractor_thumbnail.la; \
  62. - if test "$(thumbdir)" != ""; then \
  63. - if test "$(thumbqt)" != ""; then \
  64. - $(LN_S) $(plugindir)/libextractor_thumbnailqt$(LIBEXT) \
  65. - $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
  66. - else \
  67. - $(LN_S) $(plugindir)/libextractor_thumbnailgtk$(LIBEXT) \
  68. - $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
  69. - fi; \
  70. - else \
  71. - $(LN_S) $(plugindir)/libextractor_thumbnailqt$(LIBEXT) \
  72. - $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
  73. - fi;
  74. # Tell versions [3.59,3.63) of GNU make to not export all variables.
  75. # Otherwise a system limit (for SysV at least) may be exceeded.
  76. .NOEXPORT:
  77. Index: src/plugins/exiv2/Makefile.in
  78. --- src/plugins/exiv2/Makefile.in.orig 2006-11-12 05:56:23 +0100
  79. +++ src/plugins/exiv2/Makefile.in 2006-11-12 09:58:43 +0100
  80. @@ -191,12 +191,12 @@
  81. LDFLAGS = @LDFLAGS@
  82. LIBADD_DL = @LIBADD_DL@
  83. LIBEXT = @LIBEXT@
  84. -LIBICONV = @LIBICONV@
  85. +LIBICONV =
  86. LIBINTL = @LIBINTL@
  87. LIBLTDL = @LIBLTDL@
  88. LIBOBJS = @LIBOBJS@
  89. LIBS = \
  90. - @LTLIBINTL@ @LIBS@
  91. + @LIBS@
  92. LIBTOOL = @LIBTOOL@
  93. LN_S = @LN_S@
  94. Index: src/plugins/hash/Makefile.in
  95. --- src/plugins/hash/Makefile.in.orig 2006-11-12 05:56:23 +0100
  96. +++ src/plugins/hash/Makefile.in 2006-11-12 09:58:43 +0100
  97. @@ -180,12 +180,12 @@
  98. LDFLAGS = @LDFLAGS@
  99. LIBADD_DL = @LIBADD_DL@
  100. LIBEXT = @LIBEXT@
  101. -LIBICONV = @LIBICONV@
  102. +LIBICONV =
  103. LIBINTL = @LIBINTL@
  104. LIBLTDL = @LIBLTDL@
  105. LIBOBJS = @LIBOBJS@
  106. LIBS = \
  107. - @LTLIBINTL@ @LIBS@
  108. + @LIBS@
  109. LIBTOOL = @LIBTOOL@
  110. LN_S = @LN_S@
  111. Index: src/plugins/ole2/Makefile.in
  112. --- src/plugins/ole2/Makefile.in.orig 2006-11-12 05:56:23 +0100
  113. +++ src/plugins/ole2/Makefile.in 2006-11-12 09:58:43 +0100
  114. @@ -162,12 +162,12 @@
  115. LDFLAGS = @LDFLAGS@
  116. LIBADD_DL = @LIBADD_DL@
  117. LIBEXT = @LIBEXT@
  118. -LIBICONV = @LIBICONV@
  119. +LIBICONV =
  120. LIBINTL = @LIBINTL@
  121. LIBLTDL = @LIBLTDL@
  122. LIBOBJS = @LIBOBJS@
  123. LIBS = \
  124. - @LTLIBINTL@ @LIBS@
  125. + @LIBS@
  126. LIBTOOL = @LIBTOOL@
  127. LN_S = @LN_S@
  128. Index: src/plugins/oo/Makefile.in
  129. --- src/plugins/oo/Makefile.in.orig 2006-11-12 05:56:24 +0100
  130. +++ src/plugins/oo/Makefile.in 2006-11-12 09:58:43 +0100
  131. @@ -166,12 +166,12 @@
  132. LDFLAGS = @LDFLAGS@
  133. LIBADD_DL = @LIBADD_DL@
  134. LIBEXT = @LIBEXT@
  135. -LIBICONV = @LIBICONV@
  136. +LIBICONV =
  137. LIBINTL = @LIBINTL@
  138. LIBLTDL = @LIBLTDL@
  139. LIBOBJS = @LIBOBJS@
  140. LIBS = \
  141. - @LTLIBINTL@ @LIBS@
  142. + @LIBS@
  143. LIBTOOL = @LIBTOOL@
  144. LN_S = @LN_S@
  145. Index: src/plugins/pdf/Makefile.in
  146. --- src/plugins/pdf/Makefile.in.orig 2006-11-12 05:56:24 +0100
  147. +++ src/plugins/pdf/Makefile.in 2006-11-12 09:58:43 +0100
  148. @@ -183,12 +183,12 @@
  149. LDFLAGS = @LDFLAGS@
  150. LIBADD_DL = @LIBADD_DL@
  151. LIBEXT = @LIBEXT@
  152. -LIBICONV = @LIBICONV@
  153. +LIBICONV =
  154. LIBINTL = @LIBINTL@
  155. LIBLTDL = @LIBLTDL@
  156. LIBOBJS = @LIBOBJS@
  157. LIBS = \
  158. - @LTLIBINTL@ @LIBS@
  159. + @LIBS@
  160. LIBTOOL = @LIBTOOL@
  161. LN_S = @LN_S@
  162. Index: src/plugins/printable/Makefile.in
  163. --- src/plugins/printable/Makefile.in.orig 2006-11-12 05:56:25 +0100
  164. +++ src/plugins/printable/Makefile.in 2006-11-12 09:58:43 +0100
  165. @@ -492,12 +492,12 @@
  166. LDFLAGS = @LDFLAGS@
  167. LIBADD_DL = @LIBADD_DL@
  168. LIBEXT = @LIBEXT@
  169. -LIBICONV = @LIBICONV@
  170. +LIBICONV =
  171. LIBINTL = @LIBINTL@
  172. LIBLTDL = @LIBLTDL@
  173. LIBOBJS = @LIBOBJS@
  174. LIBS = \
  175. - @LTLIBINTL@ @LIBS@
  176. + @LIBS@
  177. LIBTOOL = @LIBTOOL@
  178. LN_S = @LN_S@
  179. Index: src/plugins/rpm/Makefile.in
  180. --- src/plugins/rpm/Makefile.in.orig 2006-11-12 05:56:25 +0100
  181. +++ src/plugins/rpm/Makefile.in 2006-11-12 09:58:43 +0100
  182. @@ -165,12 +165,12 @@
  183. LDFLAGS = @LDFLAGS@
  184. LIBADD_DL = @LIBADD_DL@
  185. LIBEXT = @LIBEXT@
  186. -LIBICONV = @LIBICONV@
  187. +LIBICONV =
  188. LIBINTL = @LIBINTL@
  189. LIBLTDL = @LIBLTDL@
  190. LIBOBJS = @LIBOBJS@
  191. LIBS = \
  192. - @LTLIBINTL@ @LIBS@
  193. + @LIBS@
  194. LIBTOOL = @LIBTOOL@
  195. LN_S = @LN_S@
  196. Index: src/plugins/thumbnail/Makefile.in
  197. --- src/plugins/thumbnail/Makefile.in.orig 2006-11-12 05:56:25 +0100
  198. +++ src/plugins/thumbnail/Makefile.in 2006-11-12 09:58:43 +0100
  199. @@ -161,12 +161,12 @@
  200. LDFLAGS = @LDFLAGS@
  201. LIBADD_DL = @LIBADD_DL@
  202. LIBEXT = @LIBEXT@
  203. -LIBICONV = @LIBICONV@
  204. +LIBICONV =
  205. LIBINTL = @LIBINTL@
  206. LIBLTDL = @LIBLTDL@
  207. LIBOBJS = @LIBOBJS@
  208. LIBS = \
  209. - @LTLIBINTL@ @LIBS@
  210. + @LIBS@
  211. LIBTOOL = @LIBTOOL@
  212. LN_S = @LN_S@
  213. @@ -271,7 +271,7 @@
  214. $(GLIB_CFLAGS) $(GTK_CFLAGS)
  215. libextractor_thumbnailgtk_la_LIBADD = \
  216. - $(LIBADD) -lgobject-2.0 @GTK_LIBS@ \
  217. + $(LIBADD) -lgobject2 @GTK_LIBS@ \
  218. $(top_builddir)/src/main/libextractor.la
  219. libextractor_thumbnailgtk_la_LDFLAGS = \