Attachment 597903 Details for Bug 732162 – Patch to update fedora pkg repo to version 2.0

[patch] Patch to update fedora pkg repo to version 2.0

0001-Update-spec-and-patches-for-resynthesizer-version-2..patch (text/plain), 5.46 KB, created by Russell Harrison on 2012-07-12 20:43:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Russell Harrison

Created: 2012-07-12 20:43:27 UTC

Size: 5.46 KB

patch

obsolete

>From 5e2c2bf0e6674f01be8a608c3dabcbe235ae3dda Mon Sep 17 00:00:00 2001
>From: Russell Harrison <rharriso@redhat.com>
>Date: Thu, 12 Jul 2012 14:39:49 -0400
>Subject: [PATCH] Update spec and patches for resynthesizer version 2.0
>
>Adding source tarball for version 2.0
>---
> .gitignore                                         |    1 +
> ...r-0001-fix-build-for-changes-in-GLib-2.31.patch |   27 ++++++++++++++
> gimp-resynthesizer-makefile.patch                  |   21 -----------
> gimp-resynthesizer.spec                            |   38 +++++++++++---------
> sources                                            |    2 +-
> 5 files changed, 50 insertions(+), 39 deletions(-)
> create mode 100644 gimp-resynthesizer-0001-fix-build-for-changes-in-GLib-2.31.patch
> delete mode 100644 gimp-resynthesizer-makefile.patch
>
>diff --git a/.gitignore b/.gitignore
>index 14b6a8b..ab4f56f 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -1 +1,2 @@
> resynthesizer-0.16.tar.gz
>+/bootchk-resynthesizer-v2.0-0-gdeb9a4d.tar.gz
>diff --git a/gimp-resynthesizer-0001-fix-build-for-changes-in-GLib-2.31.patch b/gimp-resynthesizer-0001-fix-build-for-changes-in-GLib-2.31.patch
>new file mode 100644
>index 0000000..53ef01e
>--- /dev/null
>+++ b/gimp-resynthesizer-0001-fix-build-for-changes-in-GLib-2.31.patch
>@@ -0,0 +1,27 @@
>+From e846576f706976415b6081b99b04190dbc179b5c Mon Sep 17 00:00:00 2001
>+From: Russell Harrison <rharriso@redhat.com>
>+Date: Tue, 10 Jul 2012 11:39:15 -0400
>+Subject: [PATCH] fix build for changes in GLib 2.31
>+ http://ragnermagalhaes.blogspot.com/2007/09/undefined-reference-to-gthreadinit.html
>+
>+---
>+ configure.in |    3 +++
>+ 1 file changed, 3 insertions(+)
>+
>+diff --git a/configure.in b/configure.in
>+index 515646d..b0b9717 100644
>+--- a/configure.in
>++++ b/configure.in
>+@@ -82,6 +82,9 @@ AM_GLIB_GNU_GETTEXT
>+ 
>+ AC_CHECK_FUNCS(bind_textdomain_codeset)
>+ 
>++dnl Fix for changes in GLib 2.31 
>++AC_CHECK_LIB(gthread-2.0, g_thread_init)
>++
>+ dnl lkk 2011 I copied this from the main gimp configure.in
>+ dnl where $PACKAGE is gimp and gimp_plugin_version is 2.0
>+ dnl gimpplugindir="$libdir/$PACKAGE/gimp_plugin_version"
>+-- 
>+1.7.10.4
>+
>diff --git a/gimp-resynthesizer-makefile.patch b/gimp-resynthesizer-makefile.patch
>deleted file mode 100644
>index 0d84c9c..0000000
>--- a/gimp-resynthesizer-makefile.patch
>+++ /dev/null
>@@ -1,21 +0,0 @@
>---- Makefile	2008-03-10 06:52:45.000000000 +0000
>-+++ Makefile-new	2009-01-25 17:48:59.000000000 +0000
>-@@ -5,7 +5,8 @@
>- GIMP_LDFLAGS=`$(GIMPTOOL) --libs`
>- GIMP_CFLAGS=`$(GIMPTOOL) --cflags`
>- 
>--CFLAGS=$(GIMP_CFLAGS) -O3 -fno-common -ffast-math -frename-registers -fomit-frame-pointer
>-+CFLAGS=-O3 -fno-common -ffast-math -frename-registers -fomit-frame-pointer
>-+MYCFLAGS=$(GIMP_CFLAGS) $(CFLAGS)
>- 
>- LDFLAGS=$(GIMP_LDFLAGS) -lm
>- 
>-@@ -30,7 +31,7 @@
>- 	@echo
>- 
>- resynth: resynth.cc
>--	$(CC) $(CFLAGS) -o $@ resynth.cc $(LDFLAGS)
>-+	$(CC) $(MYCFLAGS) -o $@ resynth.cc $(LDFLAGS)
>- 
>- clean:
>- 	-rm -f *~ *.o core resynth
>diff --git a/gimp-resynthesizer.spec b/gimp-resynthesizer.spec
>index 4f73497..e91a313 100644
>--- a/gimp-resynthesizer.spec
>+++ b/gimp-resynthesizer.spec
>@@ -3,16 +3,19 @@
> 
> Summary: Gimp plug-in for texture synthesis
> Name: gimp-resynthesizer
>-Version: 0.16
>-Release: 6%{?dist}
>+Version: 2.0
>+Release: 0%{?dist}
> Group: Applications/Multimedia
> License: GPLv2+
> Requires: gimp
> BuildRequires: gimp, gimp-devel
>+BuildRequires: intltool
> Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
>-URL: http://logarithmic.net/pfh/resynthesizer
>-Source: http://logarithmic.net/pfh-files/resynthesizer/resynthesizer-%{version}.tar.gz
>-Patch: gimp-resynthesizer-makefile.patch
>+URL: https://github.com/bootchk/resynthesizer
>+# You can get this tarball by following the link
>+# https://github.com/bootchk/resynthesizer/tarball/v2.0
>+Source: bootchk-resynthesizer-v2.0-0-gdeb9a4d.tar.gz
>+Patch0: gimp-resynthesizer-0001-fix-build-for-changes-in-GLib-2.31.patch
> 
> %description
> Resynthesizer is a Gimp plug-in for texture synthesis. Given a sample of a 
>@@ -22,32 +25,33 @@ texture, it can create more of that texture. This has uses including:
> - Creating themed images (by transfering a texture from one image to another)
> 
> %prep
>-%setup -q -n resynthesizer-%{version}
>+%setup -q -n bootchk-resynthesizer-28cade5
> 
>-%patch
>+%patch0 -p1
> 
> %build
>+./autogen.sh
>+%configure
> %__make  %{?_smp_mflags} CFLAGS="%{optflags}"
> 
> %install
> %__rm -rf %{buildroot}
>-%__install -p -d %{buildroot}/%{gimpplugindir}
>-%__install -p -d %{buildroot}/%{gimpscriptdir}
>-%__install -p resynth %{buildroot}/%{gimpplugindir}/
>-%__install -p -m 644 smart-remove.scm %{buildroot}/%{gimpscriptdir}
>-%__install -p -m 644 smart-enlarge.scm %{buildroot}/%{gimpscriptdir}
>+make DESTDIR=%{buildroot} install
>+%find_lang resynthesizer
> 
> %clean
> %__rm -rf %{buildroot}
> 
>-%files
>+%files -f resynthesizer.lang
> %defattr(-,root,root,-)
>-%doc README COPYING
>-%{gimpplugindir}/resynth
>-%{gimpscriptdir}/smart-remove.scm
>-%{gimpscriptdir}/smart-enlarge.scm
>+%doc AUTHORS ChangeLog COPYING INSTALL NEWS README
>+%{gimpplugindir}/*
>+%{_datadir}/resynthesizer/
> 
> %changelog
>+* Mon Jul 09 2012 Russell Harrison <rharrison@fedoraproject.org> - 2.0-0
>+- New version from new maintainer
>+
> * Tue Apr 03 2012 Nils Philippsen <nils@redhat.com> - 0.16-6
> - rebuild against gimp 2.8.0 release candidate
> 
>diff --git a/sources b/sources
>index 665c593..5cce4c5 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-097b3a21803fe02e47b8b8649af48144  resynthesizer-0.16.tar.gz
>+8eec115914f27d21fe55cd9bd97c8e52  bootchk-resynthesizer-v2.0-0-gdeb9a4d.tar.gz
>-- 
>1.7.10.4
>

Actions: View | Diff

Attachments on bug 732162: 597903