07882a9351
Depend on glib-networking [2], which is used for https connection. Fix plist when default-off options are enabled [1]. While here overhaul dependancies. py-gimp: Fix a issue with unresolved symbols in the python library, due to incorrect linking. PR: 232066 [1], 232047 [2] Reported by: bsd@dino.sk [1], rsmith@xs4all.nl [2]
106 lines
3.9 KiB
Text
106 lines
3.9 KiB
Text
--- plug-ins/pygimp/Makefile.in.orig 2018-08-19 18:48:46.000000000 +0200
|
|
+++ plug-ins/pygimp/Makefile.in 2018-10-14 17:48:35.278550000 +0200
|
|
@@ -140,7 +140,7 @@ am__installdirs = "$(DESTDIR)$(pygimpdir)" "$(DESTDIR)
|
|
"$(DESTDIR)$(pygimpdir)"
|
|
LTLIBRARIES = $(pygimp_LTLIBRARIES)
|
|
am__DEPENDENCIES_1 =
|
|
-_gimpenums_la_DEPENDENCIES = $(libgimp) $(libgimpcolor) $(libgimpbase) \
|
|
+_gimpenums_la_DEPENDENCIES = \
|
|
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
|
|
$(am__DEPENDENCIES_1)
|
|
am__gimpenums_la_OBJECTS = gimpenumsmodule.lo
|
|
@@ -152,17 +152,16 @@ am__v_lt_1 =
|
|
_gimpenums_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
|
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
|
$(_gimpenums_la_LDFLAGS) $(LDFLAGS) -o $@
|
|
-_gimpui_la_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) \
|
|
- $(libgimpconfig) $(libgimpmath) $(libgimp) $(libgimpcolor) \
|
|
- $(libgimpbase) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
|
|
+_gimpui_la_DEPENDENCIES = \
|
|
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
|
|
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
|
|
am__gimpui_la_OBJECTS = gimpuimodule.lo gimpui.lo
|
|
_gimpui_la_OBJECTS = $(am__gimpui_la_OBJECTS)
|
|
_gimpui_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
|
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
|
$(_gimpui_la_LDFLAGS) $(LDFLAGS) -o $@
|
|
-gimp_la_DEPENDENCIES = $(libgimp) $(libgimpcolor) $(libgimpbase) \
|
|
- $(libgimpui) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
|
|
+gimp_la_DEPENDENCIES = \
|
|
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
|
|
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
|
|
am_gimp_la_OBJECTS = gimpmodule.lo pygimp-item.lo pygimp-display.lo \
|
|
pygimp-drawable.lo pygimp-image.lo pygimp-parasite.lo \
|
|
@@ -171,14 +170,14 @@ gimp_la_OBJECTS = $(am_gimp_la_OBJECTS)
|
|
gimp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
|
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
|
$(gimp_la_LDFLAGS) $(LDFLAGS) -o $@
|
|
-gimpcolor_la_DEPENDENCIES = $(libgimpcolor) $(am__DEPENDENCIES_1) \
|
|
+gimpcolor_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
|
|
$(am__DEPENDENCIES_1)
|
|
am_gimpcolor_la_OBJECTS = gimpcolormodule.lo pygimp-colors.lo
|
|
gimpcolor_la_OBJECTS = $(am_gimpcolor_la_OBJECTS)
|
|
gimpcolor_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
|
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
|
$(gimpcolor_la_LDFLAGS) $(LDFLAGS) -o $@
|
|
-gimpthumb_la_DEPENDENCIES = $(libgimpthumb) $(am__DEPENDENCIES_1) \
|
|
+gimpthumb_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
|
|
$(am__DEPENDENCIES_1)
|
|
am_gimpthumb_la_OBJECTS = gimpthumbmodule.lo gimpthumb.lo
|
|
gimpthumb_la_OBJECTS = $(am_gimpthumb_la_OBJECTS)
|
|
@@ -766,10 +765,7 @@ gimp_la_LDFLAGS = -module -avoid-version $(no_undefine
|
|
-export-symbols-regex initgimp
|
|
|
|
gimp_la_LIBADD = \
|
|
- $(libgimp) \
|
|
- $(libgimpcolor) \
|
|
- $(libgimpbase) \
|
|
- $(libgimpui) \
|
|
+ %%GIMP_UI_LIBS%% \
|
|
$(GLIB_LIBS) \
|
|
$(GEGL_LIBS) \
|
|
$(PYLINK_LIBS) \
|
|
@@ -782,9 +778,7 @@ _gimpenums_la_LDFLAGS = -module -avoid-version $(no_un
|
|
-export-symbols-regex init_gimpenums
|
|
|
|
_gimpenums_la_LIBADD = \
|
|
- $(libgimp) \
|
|
- $(libgimpcolor) \
|
|
- $(libgimpbase) \
|
|
+ %%GIMP_LIBS%% \
|
|
$(GLIB_LIBS) \
|
|
$(PYLINK_LIBS) \
|
|
$(RT_LIBS)
|
|
@@ -799,7 +793,7 @@ gimpcolor_la_LDFLAGS = -module -avoid-version $(no_und
|
|
-export-symbols-regex initgimpcolor
|
|
|
|
gimpcolor_la_LIBADD = \
|
|
- $(libgimpcolor) \
|
|
+ %%GIMP_LIBS%% \
|
|
$(GLIB_LIBS) \
|
|
$(PYLINK_LIBS)
|
|
|
|
@@ -811,13 +805,7 @@ _gimpui_la_LDFLAGS = -module -avoid-version $(no_undef
|
|
-export-symbols-regex init_gimpui
|
|
|
|
_gimpui_la_LIBADD = \
|
|
- $(libgimpui) \
|
|
- $(libgimpwidgets) \
|
|
- $(libgimpconfig) \
|
|
- $(libgimpmath) \
|
|
- $(libgimp) \
|
|
- $(libgimpcolor) \
|
|
- $(libgimpbase) \
|
|
+ %%GIMP_UI_LIBS%% \
|
|
$(GTK_LIBS) \
|
|
$(PYLINK_LIBS) \
|
|
$(RT_LIBS) \
|
|
@@ -831,7 +819,7 @@ gimpthumb_la_LDFLAGS = -module -avoid-version $(no_und
|
|
-export-symbols-regex initgimpthumb
|
|
|
|
gimpthumb_la_LIBADD = \
|
|
- $(libgimpthumb) \
|
|
+ %%GIMP_THUMB_LIBS%% \
|
|
$(GDK_PIXBUF_LIBS) \
|
|
$(PYLINK_LIBS)
|
|
|