Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/swfdec/patches/swfdec-uninstalled-pkgconfig-3.patch

    Contents of /trunk/swfdec/patches/swfdec-uninstalled-pkgconfig-3.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 689 - (show annotations) (download)
    Fri Sep 26 22:14:49 2008 UTC (15 years, 7 months ago) by niro
    File size: 4900 byte(s) 
    -final fix of the patch
    1 diff -Naur swfdec-0.6.8/configure.ac swfdec-0.6.8-magellan/configure.ac
    2 --- swfdec-0.6.8/configure.ac 2008-07-29 12:23:39.000000000 +0200
    3 +++ swfdec-0.6.8-magellan/configure.ac 2008-09-27 00:22:36.000000000 +0200
    4 @@ -343,6 +343,8 @@
    5 data/icons/scalable/Makefile
    6 data/swfdec.pc
    7 data/swfdec-gtk.pc
    8 +data/swfdec-uninstalled.pc
    9 +data/swfdec-gtk-uninstalled.pc
    10 doc/Makefile
    11 swfdec/Makefile
    12 swfdec/jpeg/Makefile
    13 diff -Naur swfdec-0.6.8/data/Makefile.in swfdec-0.6.8-magellan/data/Makefile.in
    14 --- swfdec-0.6.8/data/Makefile.in 2008-07-29 12:33:44.000000000 +0200
    15 +++ swfdec-0.6.8-magellan/data/Makefile.in 2008-09-27 00:22:02.000000000 +0200
    16 @@ -34,7 +34,8 @@
    17 host_triplet = @host@
    18 subdir = data
    19 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
    20 - $(srcdir)/swfdec-gtk.pc.in $(srcdir)/swfdec.pc.in
    21 + $(srcdir)/swfdec-gtk.pc.in $(srcdir)/swfdec.pc.in \
    22 + $(srcdir)/swfdec-gtk-uninstalled.pc.in $(srcdir)/swfdec-uninstalled.pc.in
    23 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    24 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \
    25 $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/configure.ac
    26 @@ -42,7 +43,7 @@
    27 $(ACLOCAL_M4)
    28 mkinstalldirs = $(install_sh) -d
    29 CONFIG_HEADER = $(top_builddir)/config.h
    30 -CONFIG_CLEAN_FILES = swfdec.pc swfdec-gtk.pc
    31 +CONFIG_CLEAN_FILES = swfdec.pc swfdec-gtk.pc swfdec-uninstalled.pc swfdec-gtk-uninstalled.pc
    32 SOURCES =
    33 DIST_SOURCES =
    34 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
    35 @@ -222,8 +223,8 @@
    36 top_srcdir = @top_srcdir@
    37 SUBDIRS = icons
    38 pkgconfigdir = $(libdir)/pkgconfig
    39 -@WITH_GTK_FALSE@pkgconfig_DATA = swfdec-@SWFDEC_MAJORMINOR@.pc
    40 -@WITH_GTK_TRUE@pkgconfig_DATA = swfdec-@SWFDEC_MAJORMINOR@.pc swfdec-gtk-@SWFDEC_MAJORMINOR@.pc
    41 +@WITH_GTK_FALSE@pkgconfig_DATA = swfdec-@SWFDEC_MAJORMINOR@.pc swfdec-@SWFDEC_MAJORMINOR@-uninstalled.pc
    42 +@WITH_GTK_TRUE@pkgconfig_DATA = swfdec-@SWFDEC_MAJORMINOR@.pc swfdec-gtk-@SWFDEC_MAJORMINOR@.pc swfdec-@SWFDEC_MAJORMINOR@-uninstalled.pc swfdec-gtk-@SWFDEC_MAJORMINOR@-uninstalled.pc
    43 CLEANFILES = swfdec-$(SWFDEC_MAJORMINOR).pc swfdec-gtk-$(SWFDEC_MAJORMINOR).pc
    44 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
    45 all: all-recursive
    46 @@ -262,6 +263,10 @@
    47 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
    48 swfdec-gtk.pc: $(top_builddir)/config.status $(srcdir)/swfdec-gtk.pc.in
    49 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
    50 +swfdec-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/swfdec-uninstalled.pc.in
    51 + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
    52 +swfdec-gtk-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/swfdec-gtk-uninstalled.pc.in
    53 + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
    54
    55 mostlyclean-libtool:
    56 -rm -f *.lo
    57 @@ -572,9 +577,15 @@
    58 swfdec-@SWFDEC_MAJORMINOR@.pc: swfdec.pc
    59 cp swfdec.pc swfdec-@SWFDEC_MAJORMINOR@.pc
    60
    61 +swfdec-@SWFDEC_MAJORMINOR@-uninstalled.pc: swfdec-uninstalled.pc
    62 + cp swfdec-uninstalled.pc swfdec-@SWFDEC_MAJORMINOR@-uninstalled.pc
    63 +
    64 swfdec-gtk-@SWFDEC_MAJORMINOR@.pc: swfdec-gtk.pc
    65 cp swfdec-gtk.pc swfdec-gtk-@SWFDEC_MAJORMINOR@.pc
    66
    67 +swfdec-gtk-@SWFDEC_MAJORMINOR@-uninstalled.pc: swfdec-gtk-uninstalled.pc
    68 + cp swfdec-gtk-uninstalled.pc swfdec-gtk-@SWFDEC_MAJORMINOR@-uninstalled.pc
    69 +
    70 install-data-hook: update-icon-cache
    71 uninstall-hook: update-icon-cache
    72
    73 diff -Naur swfdec-0.6.8/data/swfdec-gtk-uninstalled.pc.in swfdec-0.6.8-magellan/data/swfdec-gtk-uninstalled.pc.in
    74 --- swfdec-0.6.8/data/swfdec-gtk-uninstalled.pc.in 1970-01-01 01:00:00.000000000 +0100
    75 +++ swfdec-0.6.8-magellan/data/swfdec-gtk-uninstalled.pc.in 2008-09-27 00:21:19.000000000 +0200
    76 @@ -0,0 +1,11 @@
    77 +prefix=
    78 +exec_prefix=
    79 +libdir=${pc_top_builddir}/${pcfiledir}/../
    80 +includedir=${pc_top_builddir}/${pcfiledir}/../
    81 +
    82 +Name: swfdec-gtk
    83 +Description: Support for playing Flash files in Gtk using Swfdec - uninstalled
    84 +Version: @VERSION@
    85 +Requires: swfdec-@SWFDEC_MAJORMINOR@ = @PACKAGE_VERSION@ gtk+-2.0 >= @GTK_VER@
    86 +Libs: -L${libdir} -L${libdir}/swfdec/.libs -L${libdir}/swfdec-gtk/.libs -lswfdec-gtk-@SWFDEC_MAJORMINOR@
    87 +Cflags: -I${includedir} -I${includedir}/swfdec -I${includedir}/swfdec-gtk
    88 diff -Naur swfdec-0.6.8/data/swfdec-uninstalled.pc.in swfdec-0.6.8-magellan/data/swfdec-uninstalled.pc.in
    89 --- swfdec-0.6.8/data/swfdec-uninstalled.pc.in 1970-01-01 01:00:00.000000000 +0100
    90 +++ swfdec-0.6.8-magellan/data/swfdec-uninstalled.pc.in 2008-09-27 00:21:19.000000000 +0200
    91 @@ -0,0 +1,11 @@
    92 +prefix=
    93 +exec_prefix=
    94 +libdir=${pc_top_builddir}/${pcfiledir}/../
    95 +includedir=${pc_top_builddir}/${pcfiledir}/../
    96 +
    97 +Name: swfdec
    98 +Description: Decodes and Plays Flash files - uninstalled
    99 +Version: @VERSION@
    100 +Requires: glib-2.0 >= @GLIB_VER@ gobject-2.0 >= @GLIB_VER@ liboil-0.3 cairo pangocairo
    101 +Libs: -L${libdir} -L${libdir}/swfdec/.libs -L${libdir}/swfdec-gtk/.libs -lswfdec-@SWFDEC_MAJORMINOR@
    102 +Cflags: -I${includedir} -I${includedir}/swfdec -I${includedir}/swfdec-gtk