[gentoo-commits] gentoo-x86 commit in media-gfx/pornview/files: pornview-0.2.0_pre1-underlinking.patch pornview-0.2.0_pre1-autoconf.patch

[Julian Ospald (hasufell)]

hasufell    12/10/28 22:06:24

  Added:                pornview-0.2.0_pre1-underlinking.patch
                        pornview-0.2.0_pre1-autoconf.patch
  Log:
  adopt package, fix underlinking wrt #403031
  
  (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

Revision  Changes    Path
1.1                  media-gfx/pornview/files/pornview-0.2.0_pre1-underlinking.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/pornview/files/pornview-0.2.0_pre1-underlinking.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/pornview/files/pornview-0.2.0_pre1-underlinking.patch?rev=1.1&content-type=text/plain

Index: pornview-0.2.0_pre1-underlinking.patch
===================================================================
From: Julian Ospald <hasufell@g.o>
Date: Sun Oct 28 20:22:14 UTC 2012
Subject: build system

	fix underlinking
	https://bugs.gentoo.org/show_bug.cgi?id=403031

--- src/Makefile.am
+++ src/Makefile.am
@@ -52,7 +52,7 @@
 pornview_LDFLAGS = \
 	-export-dynamic
 
-pornview_LDADD = $(GTK_LIBS) $(GDK_PIXBUF_LIBS) $(PNG_LIBS) $(MOVIELIB_LIBS) \
-	$(INTLLIBS) $(LIBICONV) $(LIBCHARSET) $(X_LIBS) $(XINERAMA_LIBS) \
-	prefs_ui/libprefs_ui.la  support/widgets/libsupport_widgets.la \
-	support/libsupport_utils.la $(LIBEXIF)
+pornview_LDADD = prefs_ui/libprefs_ui.la  support/widgets/libsupport_widgets.la \
+	support/libsupport_utils.la $(LIBEXIF) \
+	$(GTK_LIBS) $(GDK_PIXBUF_LIBS) $(PNG_LIBS) $(MOVIELIB_LIBS) \
+	$(INTLLIBS) $(LIBICONV) $(LIBCHARSET) $(X_LIBS) $(XINERAMA_LIBS)



1.1                  media-gfx/pornview/files/pornview-0.2.0_pre1-autoconf.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/pornview/files/pornview-0.2.0_pre1-autoconf.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/pornview/files/pornview-0.2.0_pre1-autoconf.patch?rev=1.1&content-type=text/plain

Index: pornview-0.2.0_pre1-autoconf.patch
===================================================================
--- configure.in
+++ configure.in
@@ -38,10 +38,6 @@
 dnl ******************************
 dnl required library version
 dnl ******************************
-GLIB_REQUIRED=1.2.10
-GTK_REQUIRED=1.2.10
-GDK_PIXBUF_REQUIRED=0.16.0
-XINE_OLD_REQUIRED=0.9.9
 XINE_REQUIRED=1.0.0
 
 AC_SUBST(GLIB_REQUIRED)
@@ -63,31 +59,20 @@
 dnl ******************************
 dnl Check for GTK
 dnl ******************************
-enable_gtk2=no
-AC_ARG_WITH(gtk2,
-   [  --with-gtk2             Use Gtk+-2.0 (experimental) [default=no]],
-   [enable_gtk2="${withval}"], [enable_gtk2=no])
-if test "$enable_gtk2" = yes; then
-   AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
-   PKG_CHECK_MODULES(GTK, [
-      glib-2.0 >= $GLIB2_REQUIRED
-      gmodule-2.0 >= $GMODULE2_REQUIRED
-      gdk-pixbuf-2.0 >= $GDK_PIXBUF2_REQUIRED
-      gtk+-2.0 >= $GTK2_REQUIRED
-   ], ,[
-      AC_MSG_ERROR(Test for GTK+-2.0 failed. See the file 'INSTALL' for help)
-   ])
-   AC_SUBST(GTK_CFLAGS)
-   AC_SUBST(GTK_LIBS)
-   AC_DEFINE(USE_GTK2)
-   AC_DEFINE(USE_NORMAL_PANED)
-   AC_DEFINE(ENABLE_TREEVIEW)
-else
-   AM_PATH_GTK($GTK_REQUIRED, ,
-      AC_MSG_ERROR(Test for GTK failed. See the file 'INSTALL' for help))
-   AM_PATH_GDK_PIXBUF($GDK_PIXBUF_REQUIRED, ,
-     AC_MSG_ERROR(gdk-pixbuf 0.16.0 or higher is required))
-fi
+AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+PKG_CHECK_MODULES(GTK, [
+   glib-2.0 >= $GLIB2_REQUIRED
+   gmodule-2.0 >= $GMODULE2_REQUIRED
+   gdk-pixbuf-2.0 >= $GDK_PIXBUF2_REQUIRED
+   gtk+-2.0 >= $GTK2_REQUIRED
+], ,[
+   AC_MSG_ERROR(Test for GTK+-2.0 failed. See the file 'INSTALL' for help)
+])
+AC_SUBST(GTK_CFLAGS)
+AC_SUBST(GTK_LIBS)
+AC_DEFINE(USE_GTK2)
+AC_DEFINE(USE_NORMAL_PANED)
+AC_DEFINE(ENABLE_TREEVIEW)
 
 enable_normal_paned=no
 AC_ARG_WITH(normal-paned,
@@ -158,45 +143,20 @@
    [enable_xine=yes], [enable_xine="${enableval}"])
 
 if test "$enable_xine" = no; then
-AC_ARG_ENABLE(xine_old,
-   [  --enable-xine-old       Enable Xine library 0.9.x for movie [default=no]],
-   [enable_xine_old=yes], [enable_xine_old="${enableval}"])
-
-if test "$enable_xine_old" = no; then
 AC_ARG_ENABLE(mplayer,
    [  --enable-mplayer        Enable MPlayer for movie [default=no]],
    [enable_mplayer=yes], [enable_mplayer="${enableval}"])
 fi
-fi
 
 MOVIELIB_CFLAGS=""
 MOVIELIB_LIBS=""
 
 dnl ****************************
-dnl Check for Xine library 0.9.x
-dnl ****************************
-if test "$enable_xine_old" = yes; then
-   have_xine=no
-   AM_PATH_XINE($XINE_OLD_REQUIRED,
-      [have_xine=yes], [have_xine=no])
-   if test "$have_xine" = yes; then
-      MOVIELIB_CFLAGS=${XINE_CFLAGS}
-      MOVIELIB_LIBS=${XINE_LIBS}
-      AC_DEFINE(ENABLE_XINE_OLD)
-      AC_DEFINE(ENABLE_MOVIE)
-      movie_support="Xine 0.9.x"
-   else
-      AC_MSG_WARN(Did not find xine-lib installed)
-      enable_xine=no;
-   fi
-fi
-
-dnl ****************************
 dnl Check for Xine library
 dnl ****************************
 if test "$enable_xine" = yes; then
    have_xine=no
-   AM_PATH_XINE($XINE_REQUIRED,
+   PKG_CHECK_MODULES(XINE, libxine,
       [have_xine=yes], [have_xine=no])
    if test "$have_xine" = yes; then
       MOVIELIB_CFLAGS=${XINE_CFLAGS}
@@ -241,11 +201,6 @@
 localedir="\${datadir}/locale"
 AC_SUBST(localedir)
 
-dnl *******************
-dnl for libcharset
-dnl *******************
-AM_LIBCHARSET
-
 dnl ******************************
 dnl enable/disable EXIF support
 dnl ******************************