rpms/gimp
6
0
Fork 0
Code Issues Pull Requests Releases Activity

fix linking problem more

Browse Source
This commit is contained in:
Nils Philippsen 2015-07-16 15:07:46 +02:00
parent 778df2478a
commit cf882f2977
3 changed files with 563 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

464
gimp-2.8.14-2-autofoo.patch
View File

@ -1,5 +1,116 @@
diff -up gimp-2.8.14/app/config/Makefile.in.autofoo gimp-2.8.14/app/config/Makefile.in
--- gimp-2.8.14/app/config/Makefile.in.autofoo 2014-08-26 19:02:46.000000000 +0200
+++ gimp-2.8.14/app/config/Makefile.in 2015-07-16 14:56:11.636587432 +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,
@@ -15,7 +15,17 @@
@SET_MAKE@
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 \
?) ;; \
@@ -81,17 +91,20 @@ host_triplet = @host@
EXTRA_PROGRAMS = test-config$(EXEEXT)
TESTS = test-config$(EXEEXT)
subdir = app/config
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/depcomp $(top_srcdir)/test-driver
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 =
@@ -388,6 +401,8 @@ TEST_LOGS = $(am__test_logs2:.test.log=.
TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
$(TEST_LOG_FLAGS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
+ $(top_srcdir)/test-driver
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
AA_LIBS = @AA_LIBS@
ACLOCAL = @ACLOCAL@
@@ -731,6 +746,7 @@ libgimpcolor = $(top_builddir)/libgimpco
libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la
libgimpthumb = $(top_builddir)/libgimpthumb/libgimpthumb-$(GIMP_API_VERSION).la
+@OS_WIN32_FALSE@libm = -lm
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Config\" \
-DGIMP_APP_VERSION_STRING=\"$(GIMP_APP_VERSION)\"
@@ -826,7 +842,8 @@ test_config_LDADD = \
$(PANGOCAIRO_LIBS) \
$(GDK_PIXBUF_LIBS) \
$(GEGL_LIBS) \
- $(GLIB_LIBS)
+ $(GLIB_LIBS) \
+ $(libm)
CLEANFILES = $(EXTRA_PROGRAMS) foorc $(gen_sources)
@@ -851,7 +868,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/config/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu app/config/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -1014,7 +1030,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
if test -n "$$am__remaking_logs"; then \
echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
"recursion detected" >&2; \
- else \
+ elif test -n "$$redo_logs"; then \
am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
fi; \
if $(am__make_dryrun); then :; else \
@@ -1303,6 +1319,8 @@ uninstall-am:
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
recheck tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
config-enums.c: $(srcdir)/config-enums.h $(GIMP_MKENUMS)
$(GIMP_MKENUMS) \
diff -up gimp-2.8.14/app/Makefile.in.autofoo gimp-2.8.14/app/Makefile.in
--- 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
+++ gimp-2.8.14/app/Makefile.in 2015-07-16 14:56:11.437590324 +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.
@ -29,7 +140,7 @@
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -84,19 +94,21 @@
@@ -84,19 +94,21 @@ host_triplet = @host@
@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)
@ -56,7 +167,7 @@
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -133,7 +145,7 @@
@@ -133,7 +145,7 @@ am__DEPENDENCIES_2 = xcf/libappxcf.a pdb
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@ -65,7 +176,7 @@
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 @@
@@ -250,6 +262,8 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@ -74,7 +185,7 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -691,6 +705,7 @@
@@ -691,6 +705,7 @@ libapp_a_SOURCES = $(libapp_sources) $(l
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)
@ -82,7 +193,7 @@
@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 @@
@@ -774,7 +789,8 @@ gimpconsoleldadd = \
$(GEGL_LIBS) \
$(GLIB_LIBS) \
$(INTLLIBS) \
@ -92,7 +203,7 @@
gimp_2_8_LDFLAGS = \
$(AM_LDFLAGS) \
@@ -822,7 +838,6 @@
@@ -822,7 +838,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu app/Makefile
@ -100,7 +211,7 @@
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -831,7 +846,7 @@
@@ -831,7 +846,7 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
@ -109,7 +220,7 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1439,6 +1454,8 @@
@@ -1439,6 +1454,8 @@ uninstall-am: uninstall-binPROGRAMS unin
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am uninstall-binPROGRAMS uninstall-local
@ -118,3 +229,338 @@
$(srcdir)/version.c: git-version.h
diff -up gimp-2.8.14/app/tests/Makefile.in.autofoo gimp-2.8.14/app/tests/Makefile.in
--- gimp-2.8.14/app/tests/Makefile.in.autofoo 2014-08-26 19:02:47.000000000 +0200
+++ gimp-2.8.14/app/tests/Makefile.in 2015-07-16 14:56:12.223578901 +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,
@@ -15,7 +15,17 @@
@SET_MAKE@
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 \
?) ;; \
@@ -91,17 +101,20 @@ TESTS = test-core$(EXEEXT) test-gimpidta
test-ui$(EXEEXT) test-xcf$(EXEEXT)
EXTRA_PROGRAMS = $(am__EXEEXT_1)
subdir = app/tests
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/depcomp $(top_srcdir)/test-driver
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 =
@@ -161,7 +174,7 @@ test_core_DEPENDENCIES = \
$(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)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
@@ -201,7 +214,7 @@ test_gimpidtable_DEPENDENCIES = \
$(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)
test_gimptilebackendtilemanager_SOURCES = \
test-gimptilebackendtilemanager.c
test_gimptilebackendtilemanager_OBJECTS = \
@@ -239,7 +252,7 @@ test_gimptilebackendtilemanager_DEPENDEN
$(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)
test_save_and_export_SOURCES = test-save-and-export.c
test_save_and_export_OBJECTS = test-save-and-export.$(OBJEXT)
test_save_and_export_LDADD = $(LDADD)
@@ -275,7 +288,7 @@ test_save_and_export_DEPENDENCIES = \
$(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)
test_session_2_6_compatibility_SOURCES = \
test-session-2-6-compatibility.c
test_session_2_6_compatibility_OBJECTS = \
@@ -313,7 +326,7 @@ test_session_2_6_compatibility_DEPENDENC
$(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)
test_session_2_8_compatibility_multi_window_SOURCES = \
test-session-2-8-compatibility-multi-window.c
test_session_2_8_compatibility_multi_window_OBJECTS = \
@@ -351,7 +364,7 @@ test_session_2_8_compatibility_multi_win
$(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)
test_session_2_8_compatibility_single_window_SOURCES = \
test-session-2-8-compatibility-single-window.c
test_session_2_8_compatibility_single_window_OBJECTS = \
@@ -389,7 +402,7 @@ test_session_2_8_compatibility_single_wi
$(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)
test_single_window_mode_SOURCES = test-single-window-mode.c
test_single_window_mode_OBJECTS = test-single-window-mode.$(OBJEXT)
test_single_window_mode_LDADD = $(LDADD)
@@ -425,7 +438,7 @@ test_single_window_mode_DEPENDENCIES =
$(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)
test_tools_SOURCES = test-tools.c
test_tools_OBJECTS = test-tools.$(OBJEXT)
test_tools_LDADD = $(LDADD)
@@ -461,7 +474,7 @@ test_tools_DEPENDENCIES = \
$(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)
test_ui_SOURCES = test-ui.c
test_ui_OBJECTS = test-ui.$(OBJEXT)
test_ui_LDADD = $(LDADD)
@@ -497,7 +510,7 @@ test_ui_DEPENDENCIES = \
$(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)
test_xcf_SOURCES = test-xcf.c
test_xcf_OBJECTS = test-xcf.$(OBJEXT)
test_xcf_LDADD = $(LDADD)
@@ -533,7 +546,7 @@ test_xcf_DEPENDENCIES = \
$(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)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -824,6 +837,8 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)
TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
$(TEST_LOG_FLAGS)
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
+ $(top_srcdir)/test-driver
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -1215,6 +1230,7 @@ libgimpmath = $(top_builddir)/libgimpmat
libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la
libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
libgimpthumb = $(top_builddir)/libgimpthumb/libgimpthumb-$(GIMP_API_VERSION).la
+@OS_WIN32_FALSE@libm = -lm
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
@@ -1293,7 +1309,8 @@ LDADD = \
$(GEGL_LIBS) \
$(GLIB_LIBS) \
$(INTLLIBS) \
- $(RT_LIBS)
+ $(RT_LIBS) \
+ $(libm)
all: all-recursive
@@ -1311,7 +1328,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/tests/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu app/tests/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -1558,7 +1574,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
if test -n "$$am__remaking_logs"; then \
echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
"recursion detected" >&2; \
- else \
+ elif test -n "$$redo_logs"; then \
am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
fi; \
if $(am__make_dryrun); then :; else \
@@ -1944,6 +1960,8 @@ uninstall-am:
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
recheck tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
$(TESTS): gimpdir-output
diff -up gimp-2.8.14/devel-docs/app/Makefile.in.autofoo gimp-2.8.14/devel-docs/app/Makefile.in
--- gimp-2.8.14/devel-docs/app/Makefile.in.autofoo 2014-08-26 19:02:50.000000000 +0200
+++ gimp-2.8.14/devel-docs/app/Makefile.in 2015-07-16 14:56:13.872554935 +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,
@@ -20,7 +20,17 @@
# Everything below here is generic #
####################################
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 \
?) ;; \
@@ -83,18 +93,21 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/gtk-doc.make $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(srcdir)/version.in
subdir = devel-docs/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 = version
@@ -119,6 +132,8 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/version.in \
+ $(top_srcdir)/gtk-doc.make
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
AA_LIBS = @AA_LIBS@
ACLOCAL = @ACLOCAL@
@@ -517,6 +532,7 @@ GTKDOC_CFLAGS = \
-I$(includedir) \
-UGTK_DISABLE_SINGLE_INCLUDES
+@OS_WIN32_FALSE@libm = -lm
GTKDOC_LIBS = \
-u $(SYMPREFIX)xcf_init \
-u $(SYMPREFIX)internal_procs_init \
@@ -566,7 +582,8 @@ GTKDOC_LIBS = \
$(DBUS_GLIB_LIBS) \
$(GEGL_LIBS) \
$(RT_LIBS) \
- $(INTLLIBS)
+ $(INTLLIBS) \
+ $(libm)
@ENABLE_GTK_DOC_APP_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@ENABLE_GTK_DOC_APP_TRUE@@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -670,7 +687,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-docs/app/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu devel-docs/app/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -679,7 +695,7 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
-$(top_srcdir)/gtk-doc.make:
+$(top_srcdir)/gtk-doc.make $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -775,11 +791,11 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-@ENABLE_GTK_DOC_APP_FALSE@distclean-local:
-@ENABLE_GTK_DOC_APP_FALSE@maintainer-clean-local:
-@ENABLE_GTK_DOC_APP_FALSE@clean-local:
@ENABLE_GTK_DOC_APP_FALSE@install-data-local:
+@ENABLE_GTK_DOC_APP_FALSE@clean-local:
@ENABLE_GTK_DOC_APP_FALSE@uninstall-local:
+@ENABLE_GTK_DOC_APP_FALSE@maintainer-clean-local:
+@ENABLE_GTK_DOC_APP_FALSE@distclean-local:
clean: clean-am
clean-am: clean-generic clean-libtool clean-local mostlyclean-am
@@ -863,6 +879,8 @@ uninstall-am: uninstall-local
mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am uninstall-local
+.PRECIOUS: Makefile
+
@ENABLE_GTK_DOC_APP_TRUE@gtkdoc-check.test: Makefile
@ENABLE_GTK_DOC_APP_TRUE@ $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \

111
gimp-2.8.14-link-z-now.patch
View File

@ -1,10 +1,32 @@
From 1b5d01f6376d7b128e75636f3f158376f606686f Mon Sep 17 00:00:00 2001
From 456e98b7b2ff18a899c8a889fdded2b5459120aa Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Wed, 15 Jul 2015 17:55:45 +0200
Date: Thu, 16 Jul 2015 14:53:52 +0200
Subject: [PATCH] patch: link-z-now
Squashed commit of the following:
commit be9ae5ca9e251d19cbdb2b7ca2130fd05757b669
Author: Nils Philippsen <nils@redhat.com>
Date: Thu Jul 16 14:18:55 2015 +0200
tests: link against -lm
(see commit 4c7338c0974096dca8566a1d570ed51fbe721ae6)
(cherry picked from commit 9171de3b80735cd608b5ac099c67deb5b9ccaf1f)
commit c510e223f37a6557643b8c472f0e0e0e6b5d25ba
Author: Michael Natterer <mitch@gimp.org>
Date: Thu May 21 18:41:35 2015 +0200
Bug 749675 - gimp-2.8-doc job fails for undefined reference...
...to symbol 'fmod@@GLIBC_2.2.5'
Add -lm to GTKDOC_LIBS.
(cherry picked from commit a349f33d1f753c29523b673c1511e999f6f2ba45)
commit 4483698c0444e01afce89fcf7610d29e7670a326
Author: Michael Natterer <mitch@gimp.org>
Date: Mon Feb 16 19:35:00 2015 +0100
@ -13,8 +35,11 @@ Date: Mon Feb 16 19:35:00 2015 +0100
(cherry picked from commit 4c7338c0974096dca8566a1d570ed51fbe721ae6)
---
app/Makefile.am | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
app/Makefile.am | 5 ++++-
app/config/Makefile.am | 8 +++++++-
app/tests/Makefile.am | 8 +++++++-
devel-docs/app/Makefile.am | 8 +++++++-
4 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/app/Makefile.am b/app/Makefile.am
index 243f08a..f3f5ba5 100644
@ -39,6 +64,84 @@ index 243f08a..f3f5ba5 100644
gimp_2_8_LDFLAGS = \
$(AM_LDFLAGS) \
diff --git a/app/config/Makefile.am b/app/config/Makefile.am
index 8012c01..5ba7704 100644
--- a/app/config/Makefile.am
+++ b/app/config/Makefile.am
@@ -7,6 +7,11 @@ libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la
libgimpthumb = $(top_builddir)/libgimpthumb/libgimpthumb-$(GIMP_API_VERSION).la
+if OS_WIN32
+else
+libm = -lm
+endif
+
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Config\" \
-DGIMP_APP_VERSION_STRING=\"$(GIMP_APP_VERSION)\"
@@ -111,7 +116,8 @@ test_config_LDADD = \
$(PANGOCAIRO_LIBS) \
$(GDK_PIXBUF_LIBS) \
$(GEGL_LIBS) \
- $(GLIB_LIBS)
+ $(GLIB_LIBS) \
+ $(libm)
CLEANFILES = $(EXTRA_PROGRAMS) foorc
diff --git a/app/tests/Makefile.am b/app/tests/Makefile.am
index 821b76c..96b9550 100644
--- a/app/tests/Makefile.am
+++ b/app/tests/Makefile.am
@@ -51,6 +51,11 @@ libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).
libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
libgimpthumb = $(top_builddir)/libgimpthumb/libgimpthumb-$(GIMP_API_VERSION).la
+if OS_WIN32
+else
+libm = -lm
+endif
+
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
@@ -127,7 +132,8 @@ LDADD = \
$(GEGL_LIBS) \
$(GLIB_LIBS) \
$(INTLLIBS) \
- $(RT_LIBS)
+ $(RT_LIBS) \
+ $(libm)
gimpdir-output:
mkdir -p gimpdir-output
diff --git a/devel-docs/app/Makefile.am b/devel-docs/app/Makefile.am
index 9ebb9fc..4e96e36 100644
--- a/devel-docs/app/Makefile.am
+++ b/devel-docs/app/Makefile.am
@@ -61,6 +61,11 @@ GTKDOC_CFLAGS = \
-I$(includedir) \
-UGTK_DISABLE_SINGLE_INCLUDES
+if OS_WIN32
+else
+libm = -lm
+endif
+
GTKDOC_LIBS = \
-u $(SYMPREFIX)xcf_init \
-u $(SYMPREFIX)internal_procs_init \
@@ -110,7 +115,8 @@ GTKDOC_LIBS = \
$(DBUS_GLIB_LIBS) \
$(GEGL_LIBS) \
$(RT_LIBS) \
- $(INTLLIBS)
+ $(INTLLIBS) \
+ $(libm)
if ENABLE_GTK_DOC_APP
--
2.4.3

2
gimp.spec
View File

@ -668,7 +668,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%endif
%changelog
* Wed Jul 15 2015 Nils Philippsen <nils@redhat.com> - 2:2.8.14-2
* Thu Jul 16 2015 Nils Philippsen <nils@redhat.com> - 2:2.8.14-2
- fix linking problem
* Tue Jul 14 2015 Nils Philippsen <nils@redhat.com> - 2:2.8.14-2