summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libfm/libfm-0.1.17
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/libfm/libfm-0.1.17')
-rw-r--r--meta/recipes-support/libfm/libfm-0.1.17/configure_fix.patch19
-rw-r--r--meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch48
2 files changed, 0 insertions, 67 deletions
diff --git a/meta/recipes-support/libfm/libfm-0.1.17/configure_fix.patch b/meta/recipes-support/libfm/libfm-0.1.17/configure_fix.patch
deleted file mode 100644
index 351e6e71aa..0000000000
--- a/meta/recipes-support/libfm/libfm-0.1.17/configure_fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1Update configure.ac after docs removed in 0.1.16
2
3Upstream-Status: Pending
4
5Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
6Index: libfm-0.1.16/configure.ac
7===================================================================
8--- libfm-0.1.16.orig/configure.ac 2011-10-10 15:13:21.000000000 +0800
9+++ libfm-0.1.16/configure.ac 2011-10-10 15:13:30.000000000 +0800
10@@ -153,9 +153,6 @@
11 data/Makefile
12 data/ui/Makefile
13 po/Makefile.in
14- docs/Makefile
15- docs/reference/Makefile
16- docs/reference/libfm/Makefile
17 libfm.pc
18 libfm-gtk.pc
19 ])
diff --git a/meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch b/meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch
deleted file mode 100644
index 3efb4ddd6c..0000000000
--- a/meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1Upstream-Status: Pending
2
3This patch fixes following kind of issues with automake 1.12
4| automake: warnings are treated as errors
5| data/ui/Makefile.am:21: warning: '%'-style pattern rules are a GNU make extension
6...
7| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libfm-gtk.la': linking libtool libraries using a non-POSIX
8| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac'
9...
10| src/Makefile.am:21: warning: compiling 'glib-compat.c' with per-target flags requires 'AM_PROG_CC_C_O' in 'configure.ac'
11
12Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
132012/05/03
14
15Index: libfm-0.1.17/configure.ac
16===================================================================
17--- libfm-0.1.17.orig/configure.ac
18+++ libfm-0.1.17/configure.ac
19@@ -4,11 +4,17 @@
20 AC_PREREQ([2.63])
21 AC_INIT([libfm], [0.1.17], [http://pcmanfm.sorceforge.net/])
22 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
23+
24+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
25+m4_pattern_allow([AM_PROG_AR])
26+AM_PROG_AR
27+
28 AC_CONFIG_MACRO_DIR(m4)
29 AC_CONFIG_HEADERS([config.h])
30
31 # Checks for programs.
32 AC_PROG_CC
33+AM_PROG_CC_C_O
34 AM_PROG_LIBTOOL
35
36 # Checks for libraries.
37Index: libfm-0.1.17/data/ui/Makefile.am
38===================================================================
39--- libfm-0.1.17.orig/data/ui/Makefile.am
40+++ libfm-0.1.17/data/ui/Makefile.am
41@@ -18,6 +18,6 @@ EXTRA_DIST = \
42 $(NULL)
43
44 # Purge GtkBuilder UI files
45-%.ui: %.glade
46+.glade.ui:
47 cp $< $@
48 $(top_builddir)/src/xml-purge $@