make autofoo patch more palatable to F21
This commit is contained in:
Nils Philippsen
parent
fcdb351681
commit
778df2478a
1
.gitignore
vendored
1
.gitignore
vendored
@ -19,4 +19,3 @@ gimp-2.6.10-1-autoreconf.patch.bz2
|
||||
/gimp-2.8.10.tar.bz2
|
||||
/gimp-2.8.12.tar.bz2
|
||||
/gimp-2.8.14.tar.bz2
|
||||
/gimp-2.8.14-2-autofoo.patch.xz
|
||||
|
||||
120
gimp-2.8.14-2-autofoo.patch
Normal file
120
gimp-2.8.14-2-autofoo.patch
Normal file
@ -0,0 +1,120 @@
|
||||
--- gimp-2.8.14/app/Makefile.in.autofoo 2014-08-26 19:02:46.000000000 +0200
|
||||
+++ gimp-2.8.14/app/Makefile.in 2015-07-15 22:00:50.047789039 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
|
||||
+# Makefile.in generated by automake 1.15 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
|
||||
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
|
||||
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@@ -18,7 +18,17 @@
|
||||
|
||||
|
||||
VPATH = @srcdir@
|
||||
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
|
||||
+am__is_gnu_make = { \
|
||||
+ if test -z '$(MAKELEVEL)'; then \
|
||||
+ false; \
|
||||
+ elif test -n '$(MAKE_HOST)'; then \
|
||||
+ true; \
|
||||
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
|
||||
+ true; \
|
||||
+ else \
|
||||
+ false; \
|
||||
+ fi; \
|
||||
+}
|
||||
am__make_running_with_option = \
|
||||
case $${target_option-} in \
|
||||
?) ;; \
|
||||
@@ -84,19 +94,21 @@
|
||||
@ENABLE_GIMP_CONSOLE_FALSE@bin_PROGRAMS = gimp-2.8$(EXEEXT)
|
||||
@ENABLE_GIMP_CONSOLE_TRUE@bin_PROGRAMS = gimp-2.8$(EXEEXT) \
|
||||
@ENABLE_GIMP_CONSOLE_TRUE@ gimp-console-2.8$(EXEEXT)
|
||||
-DIST_COMMON = $(top_srcdir)/build/windows/gimprc.rule \
|
||||
- $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
|
||||
- $(top_srcdir)/depcomp
|
||||
subdir = app
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
|
||||
- $(top_srcdir)/m4macros/alsa.m4 \
|
||||
+am__aclocal_m4_deps = $(top_srcdir)/m4macros/libtool.m4 \
|
||||
+ $(top_srcdir)/m4macros/ltoptions.m4 \
|
||||
+ $(top_srcdir)/m4macros/ltsugar.m4 \
|
||||
+ $(top_srcdir)/m4macros/ltversion.m4 \
|
||||
+ $(top_srcdir)/m4macros/lt~obsolete.m4 \
|
||||
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \
|
||||
$(top_srcdir)/m4macros/binreloc.m4 \
|
||||
$(top_srcdir)/m4macros/detectcflags.m4 \
|
||||
$(top_srcdir)/m4macros/gimpprint.m4 \
|
||||
$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
|
||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||
$(ACLOCAL_M4)
|
||||
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
|
||||
mkinstalldirs = $(install_sh) -d
|
||||
CONFIG_HEADER = $(top_builddir)/config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
@@ -133,7 +145,7 @@
|
||||
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
|
||||
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
|
||||
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
|
||||
- $(am__DEPENDENCIES_1)
|
||||
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
|
||||
gimp_2_8_DEPENDENCIES = gui/libappgui.a menus/libappmenus.a \
|
||||
actions/libappactions.a dialogs/libappdialogs.a \
|
||||
tools/libapptools.a display/libappdisplay.a \
|
||||
@@ -250,6 +262,8 @@
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
DIST_SUBDIRS = $(SUBDIRS)
|
||||
+am__DIST_COMMON = $(srcdir)/Makefile.in \
|
||||
+ $(top_srcdir)/build/windows/gimprc.rule $(top_srcdir)/depcomp
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
am__relativize = \
|
||||
dir0=`pwd`; \
|
||||
@@ -691,6 +705,7 @@
|
||||
gimp_2_8_SOURCES = $(libapp_sources) main.c
|
||||
@PLATFORM_OSX_TRUE@framework_cocoa = -framework Cocoa
|
||||
@OS_WIN32_TRUE@win32_ldflags = -mwindows -Wl,--tsaware $(WIN32_LARGE_ADDRESS_AWARE)
|
||||
+@OS_WIN32_FALSE@libm = -lm
|
||||
@USE_BINRELOC_TRUE@munix = -Wl,-rpath '-Wl,$$ORIGIN/../lib'
|
||||
@HAVE_WINDRES_TRUE@GIMPAPPRC = $(top_srcdir)/build/windows/gimp.rc
|
||||
@HAVE_WINDRES_TRUE@GIMPRC = gimp-$(GIMP_APP_VERSION).rc.o
|
||||
@@ -774,7 +789,8 @@
|
||||
$(GEGL_LIBS) \
|
||||
$(GLIB_LIBS) \
|
||||
$(INTLLIBS) \
|
||||
- $(RT_LIBS)
|
||||
+ $(RT_LIBS) \
|
||||
+ $(libm)
|
||||
|
||||
gimp_2_8_LDFLAGS = \
|
||||
$(AM_LDFLAGS) \
|
||||
@@ -822,7 +838,6 @@
|
||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/Makefile'; \
|
||||
$(am__cd) $(top_srcdir) && \
|
||||
$(AUTOMAKE) --gnu app/Makefile
|
||||
-.PRECIOUS: Makefile
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||
@case '$?' in \
|
||||
*config.status*) \
|
||||
@@ -831,7 +846,7 @@
|
||||
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
|
||||
esac;
|
||||
-$(top_srcdir)/build/windows/gimprc.rule:
|
||||
+$(top_srcdir)/build/windows/gimprc.rule $(am__empty):
|
||||
|
||||
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||
@@ -1439,6 +1454,8 @@
|
||||
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
|
||||
uninstall-am uninstall-binPROGRAMS uninstall-local
|
||||
|
||||
+.PRECIOUS: Makefile
|
||||
+
|
||||
|
||||
$(srcdir)/version.c: git-version.h
|
||||
|
||||
@ -212,7 +212,7 @@ Patch2: gimp-2.8.14-export-dialog-destroyed-crash.patch
|
||||
Patch3: gimp-2.8.14-link-z-now.patch
|
||||
|
||||
# Rebuilt autofoo files
|
||||
Patch50: gimp-2.8.14-2-autofoo.patch.xz
|
||||
Patch50: gimp-2.8.14-2-autofoo.patch
|
||||
|
||||
# use external help browser directly if help browser plug-in is not built
|
||||
Patch100: gimp-2.8.6-external-help-browser.patch
|
||||
|
||||
Loading…
Reference in New Issue
Block a user