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