Compare commits
1 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
e3984fc06e |
@ -1,44 +0,0 @@
|
||||
From 06b61daa802b80a93009abaafb843f574edcaa63 Mon Sep 17 00:00:00 2001
|
||||
From: Pascal Terjan <pterjan@mageia.org>
|
||||
Date: Tue, 29 Oct 2019 10:07:53 +0000
|
||||
Subject: [PATCH] Add missing -lm to file-psd plug-in
|
||||
|
||||
psd-save.c uses RINT which uses floor(). Not sure why this only
|
||||
caused a failure on our armv7hl build and why it used to work
|
||||
but we get:
|
||||
|
||||
libtool: link: gcc -O2 -g -pipe -Wformat -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -Wall -Wdeclaration-after-statement -Wmissing-prototypes -Werror=missing-prototypes -Wmissing-declarations -Winit-self -Wpointer-arith -Wmissing-format-attribute -Wformat-security -Wlogical-op -Wtype-limits -fno-common -fdiagnostics-show-option -Wreturn-type -Wl,--as-needed -Wl,--no-undefined -Wl,-z -Wl,relro -Wl,-O1 -Wl,--build-id -Wl,--enable-new-dtags -o .libs/file-psd psd.o psd-util.o psd-load.o psd-save.o psd-thumb-load.o psd-image-res-load.o psd-layer-res-load.o -Wl,--export-dynamic -pthread -Wl,--export-dynamic -pthread ../../libgimp/.libs/libgimpui-2.0.so ../../libgimpwidgets/.libs/libgimpwidgets-2.0.so ../../libgimpconfig/.libs/libgimpconfig-2.0.so ../../libgimp/.libs/libgimp-2.0.so ../../libgimpcolor/.libs/libgimpcolor-2.0.so ../../libgimpmath/.libs/libgimpmath-2.0.so ../../libgimpbase/.libs/libgimpbase-2.0.so -lgtk-x11-2.0 -lgdk-x11-2.0 -lpangocairo-1.0 -latk-1.0 -lcairo -lgdk_pixbuf-2.0 -lpangoft2-1.0 -lpango-1.0 -lharfbuzz -lfontconfig -lfreetype -lgegl-0.4 -lgegl-npd-0.4 -lgmodule-2.0 -ljson-glib-1.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lbabl-0.1 -lz -ljpeg -pthread
|
||||
/usr/bin/ld: psd-save.o: undefined reference to symbol 'floor@@GLIBC_2.4'
|
||||
/usr/bin/ld: /lib/libm.so.6: error adding symbols: DSO missing from command line
|
||||
collect2: error: ld returned 1 exit status
|
||||
make[3]: *** [Makefile:756: file-psd] Error 1
|
||||
|
||||
And adding -lm seems the right thing to do.
|
||||
---
|
||||
plug-ins/file-psd/Makefile.am | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/plug-ins/file-psd/Makefile.am b/plug-ins/file-psd/Makefile.am
|
||||
index d8f4f3577e..10ce6485db 100644
|
||||
--- a/plug-ins/file-psd/Makefile.am
|
||||
+++ b/plug-ins/file-psd/Makefile.am
|
||||
@@ -10,6 +10,8 @@ libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
|
||||
|
||||
if OS_WIN32
|
||||
mwindows = -mwindows
|
||||
+else
|
||||
+libm = -lm
|
||||
endif
|
||||
|
||||
if HAVE_WINDRES
|
||||
@@ -53,6 +55,7 @@ AM_CPPFLAGS = \
|
||||
-I$(includedir)
|
||||
|
||||
file_psd_LDADD = \
|
||||
+ $(libm) \
|
||||
$(libgimpui) \
|
||||
$(libgimpwidgets) \
|
||||
$(libgimpconfig) \
|
||||
--
|
||||
2.23.0
|
||||
|
1
dead.package
Normal file
1
dead.package
Normal file
@ -0,0 +1 @@
|
||||
Retire modular GIMP (#1772469)
|
@ -1,25 +0,0 @@
|
||||
diff -up gimp-2.10.14/etc/gimprc.in.cm-system-monitor-profile-by-default gimp-2.10.14/etc/gimprc.in
|
||||
--- gimp-2.10.14/etc/gimprc.in.cm-system-monitor-profile-by-default 2019-10-26 21:46:48.000000000 +0200
|
||||
+++ gimp-2.10.14/etc/gimprc.in 2019-11-04 13:17:23.322750636 +0100
|
||||
@@ -317,9 +317,9 @@
|
||||
|
||||
# Defines the color management behavior. This is a parameter list.
|
||||
#
|
||||
-# (color-management
|
||||
+(color-management
|
||||
# (mode display)
|
||||
-# (display-profile-from-gdk no)
|
||||
+ (display-profile-from-gdk no)
|
||||
# (display-rendering-intent relative-colorimetric)
|
||||
# (display-use-black-point-compensation yes)
|
||||
# (display-optimize yes)
|
||||
@@ -328,7 +328,8 @@
|
||||
# (simulation-optimize yes)
|
||||
# (simulation-gamut-check no)
|
||||
# (out-of-gamut-color (color-rgb 1 0 1))
|
||||
-# (display-module "CdisplayLcms"))
|
||||
+# (display-module "CdisplayLcms")
|
||||
+)
|
||||
|
||||
# Keep a permanent record of all opened and saved files in the Recent
|
||||
# Documents list. Possible values are yes and no.
|
@ -1,11 +0,0 @@
|
||||
diff -up gimp-2.10.0/etc/gimprc.in.external-help-browser gimp-2.10.0/etc/gimprc.in
|
||||
--- gimp-2.10.0/etc/gimprc.in.external-help-browser 2018-04-28 17:25:02.483242200 +0200
|
||||
+++ gimp-2.10.0/etc/gimprc.in 2018-04-28 17:25:28.048193595 +0200
|
||||
@@ -753,6 +753,7 @@
|
||||
# web-browser.
|
||||
#
|
||||
# (help-browser gimp)
|
||||
+(help-browser web-browser)
|
||||
|
||||
# When enabled, a search of actions will also return inactive actions.
|
||||
# Possible values are yes and no.
|
@ -1,12 +0,0 @@
|
||||
diff -urNp a/etc/gimprc.in b/etc/gimprc.in
|
||||
--- a/etc/gimprc.in 2019-08-20 13:03:43.195089141 +0200
|
||||
+++ b/etc/gimprc.in 2019-08-20 13:04:09.109353485 +0200
|
||||
@@ -153,7 +153,7 @@
|
||||
# Where to look for fonts in addition to the system-wide installed fonts.
|
||||
# This is a colon-separated list of folders to search.
|
||||
#
|
||||
-# (font-path "${gimp_dir}/fonts:${gimp_data_dir}/fonts")
|
||||
+(font-path "${gimp_dir}/fonts")
|
||||
|
||||
# Specify a default brush. The brush is searched for in the specified brush
|
||||
# path. This is a string value.
|
Loading…
Reference in New Issue
Block a user