SHA256
1
0
forked from pool/gimp-gap

Accepting request 85554 from GNOME:Apps

Pushing G:A

OBS-URL: https://build.opensuse.org/request/show/85554
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gimp-gap?expand=0&rev=16
This commit is contained in:
Lars Vogdt 2011-10-02 08:03:30 +00:00 committed by Git OBS Bridge
parent 1561364a08
commit b1013b0a44
3 changed files with 29 additions and 14 deletions

19
gimp-gap-link-lm.patch Normal file
View File

@ -0,0 +1,19 @@
--- gap/Makefile.am 2009-06-04 22:38:03.000000000 +0200
+++ gap/Makefile.am.fixed 2011-09-29 10:45:49.445173300 +0200
@@ -394,14 +394,14 @@
LDADD = $(GIMP_LIBS)
-gap_plugins_LDADD = $(LIBGIMPGAP) $(LIBGAPBASE) $(GIMP_LIBS)
+gap_plugins_LDADD = $(LIBGIMPGAP) $(LIBGAPBASE) $(GIMP_LIBS) -lm
gap_bluebox_LDADD = $(LIBGIMPGAP) $(LIBGAPBASE) $(GIMP_LIBS)
gap_filter_LDADD = $(GAPVIDEOAPI) $(LIBGIMPGAP) $(LIBGAPBASE) $(GIMP_LIBS)
gap_fmac_LDADD = $(GAPVIDEOAPI) $(LIBGIMPGAP) $(LIBGAPBASE) $(GIMP_LIBS)
gap_fmac_varying_LDADD = $(GAPVIDEOAPI) $(LIBGIMPGAP) $(LIBGAPBASE) $(GIMP_LIBS)
gap_frontends_LDADD = $(LIBGIMPGAP) $(LIBGAPBASE) $(GIMP_LIBS)
gap_decode_mplayer_LDADD = $(LIBGIMPGAP) $(LIBGAPBASE) $(GIMP_LIBS)
-gap_morph_LDADD = $(LIBGIMPGAP) $(LIBGAPBASE) $(GIMP_LIBS)
+gap_morph_LDADD = $(LIBGIMPGAP) $(LIBGAPBASE) $(GIMP_LIBS) -lm
gap_name2layer_LDADD = $(LIBGIMPGAP) $(LIBGAPBASE) $(GIMP_LIBS)
gap_navigator_dialog_LDADD = $(LIBGIMPGAP) $(LIBGAPBASE) $(GIMP_LIBS)
gap_player_LDADD = $(GAPVIDEOAPI) $(WAVPLAYCLIENT) ${LIBGAPSTORY} $(LIBGAPBASE) $(GIMP_LIBS)

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Sep 29 08:41:41 UTC 2011 - idonmez@suse.com
- Add gimp-gap-link-lm.patch to fix linking with new ld.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Dec 22 15:48:24 CET 2010 - meissner@suse.de Wed Dec 22 15:48:24 CET 2010 - meissner@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package gimp-gap (Version 2.6.0) # spec file for package gimp-gap
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -54,6 +54,8 @@ Patch1: %{name}-no-strict-aliasing.patch
Patch2: %{name}-warnings.patch Patch2: %{name}-warnings.patch
# PATCH-FIX-UPSTREAM gimp-gap-warnings-orig-addon.patch bgo585343 sbrabec@suse.cz -- Fix of serious warnings. # PATCH-FIX-UPSTREAM gimp-gap-warnings-orig-addon.patch bgo585343 sbrabec@suse.cz -- Fix of serious warnings.
Patch3: %{name}-warnings-orig-addon.patch Patch3: %{name}-warnings-orig-addon.patch
# PATCH-FIX-UPSTREAM gimp-gap-link-lm.patch bgo#660443 idoenmez@suse.de -- Link to -lm where needed
Patch4: %{name}-link-lm.patch
Source1: %{name}-patch-source.sh Source1: %{name}-patch-source.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{?gimp_api_version:1}0 %if %{?gimp_api_version:1}0
@ -68,12 +70,6 @@ The GIMP-GAP (GIMP Animation Package) is a collection of Plug-Ins to
extend the GIMP with capabilities to edit and create animations as extend the GIMP with capabilities to edit and create animations as
sequences of single frames. sequences of single frames.
Authors:
--------
Wolfgang Hofer <hof@gimp.org>
%if 0%{?BUILD_ORIG} %if 0%{?BUILD_ORIG}
%if 0%{?BUILD_ORIG_ADDON} %if 0%{?BUILD_ORIG_ADDON}
@ -89,12 +85,6 @@ The GIMP-GAP (GIMP Animation Package) is a collection of Plug-Ins to
extend the GIMP with capabilities to edit and create animations as extend the GIMP with capabilities to edit and create animations as
sequences of single frames. sequences of single frames.
Authors:
--------
Wolfgang Hofer <hof@gimp.org>
%endif %endif
%endif %endif
%lang_package %lang_package
@ -113,6 +103,7 @@ translation-update-upstream
%if 0%{?BUILD_ORIG} %if 0%{?BUILD_ORIG}
%patch3 %patch3
%endif %endif
%patch4
sed -i -e "s,sr@Latn,sr@latin," po/LINGUAS sed -i -e "s,sr@Latn,sr@latin," po/LINGUAS
mv po/sr@Latn.po po/sr@latin.po mv po/sr@Latn.po po/sr@latin.po