.gear/rules | 2 + .../tags/d3ccf0e5127ac8d0d03c278acefb8bcac58f5904 | 13 + .gear/tags/list | 1 + configure.in | 1 + desktop/gimp.desktop.in.in | 8 +- gimp.spec | 376 ++++++++++++++++++++ tools/Makefile.am | 1 + tools/gimptool.c | 15 +- 8 files changed, 409 insertions(+), 8 deletions(-) diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 0000000..f78a96e --- /dev/null +++ b/.gear/rules @@ -0,0 +1,2 @@ +tar: @name@-@version@:. +diff: @name@-@version@:. . diff --git a/.gear/tags/d3ccf0e5127ac8d0d03c278acefb8bcac58f5904 b/.gear/tags/d3ccf0e5127ac8d0d03c278acefb8bcac58f5904 new file mode 100644 index 0000000..8a4a362 --- /dev/null +++ b/.gear/tags/d3ccf0e5127ac8d0d03c278acefb8bcac58f5904 @@ -0,0 +1,13 @@ +object 57802f65cf566baef3b166f1bfd4239d2be64ee6 +type commit +tag gimp-2.6.6 +tagger Valery Inozemtsev 1239798599 +0400 + +gimp 2.6.6 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEABECAAYFAknl00cACgkQcNyQ4l5HvIrD/QCgsHS59a1/v4qyQtw3BQ1aL51Y +eAgAnRQhBuORk5gK0iHgsVV4jGTKQE4W +=1asr +-----END PGP SIGNATURE----- diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 0000000..35295d1 --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +d3ccf0e5127ac8d0d03c278acefb8bcac58f5904 gimp-2.6.6 diff --git a/configure.in b/configure.in index 9a6556e..f03e46a 100644 --- a/configure.in +++ b/configure.in @@ -1654,6 +1654,7 @@ if test "x$enable_python" != xno; then PYLINK_LIBS="-L${py_exec_prefix}/libs -lpython${pylibversion}" else PYBIN_PATH="$PYTHON" + PYLINK_LIBS="-lpython$PYTHON_VERSION" fi AC_SUBST(PYLINK_LIBS) AC_SUBST(PYBIN_PATH) diff --git a/desktop/gimp.desktop.in.in b/desktop/gimp.desktop.in.in index 776e4ee..216c346 100644 --- a/desktop/gimp.desktop.in.in +++ b/desktop/gimp.desktop.in.in @@ -1,11 +1,11 @@ [Desktop Entry] Version=1.0 Type=Application -_Name=GNU Image Manipulation Program +Name=GIMP _GenericName=Image Editor _Comment=Create images and edit photographs -Exec=@GIMP_COMMAND@ %U -TryExec=gimp-@GIMP_APP_VERSION@ +Exec=gimp %U +TryExec=gimp Icon=gimp Terminal=false Categories=Graphics;2DGraphics;RasterGraphics;GTK; @@ -13,6 +13,6 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=GIMP X-GNOME-Bugzilla-Component=General X-GNOME-Bugzilla-Version=@GIMP_VERSION@ -X-GNOME-Bugzilla-OtherBinaries=gimp-@GIMP_APP_VERSION@ +X-GNOME-Bugzilla-OtherBinaries=gimp StartupNotify=true MimeType=@MIME_TYPES@ diff --git a/gimp.spec b/gimp.spec new file mode 100644 index 0000000..d2dedb7 --- /dev/null +++ b/gimp.spec @@ -0,0 +1,376 @@ +%define ver_major 2.6 +%define oldver 2.0 + +Name: gimp +Version: %ver_major.6 +Release: alt2 + +Summary: The GNU Image Manipulation Program +License: GPL, LGPL +Group: Graphics +Url: http://www.gimp.org/ + +Packager: Valery Inozemtsev + +Obsoletes: gimp2 < %version-%release +Provides: gimp2 = %version-%release +Conflicts: gimp2-perl create-resources <= 0.1.3-alt1 +Requires: lib%name = %version-%release +Requires: icc-profiles + +%py_provides gimp gimpfu + +Source: %name-%version.tar +Patch: %name-%version-%release.patch + +BuildRequires: aalib-devel gcc-c++ gtk-doc iso-codes-devel intltool libXmu-devel libXpm-devel libalsa-devel libart_lgpl-devel +BuildRequires: libexif-devel libexpat-devel libfreetype-devel libgtkhtml2-devel libjpeg-devel liblcms-devel libmng-devel +BuildRequires: libpng-devel librsvg2-devel libtiff-devel libwmf-devel perl-XML-Parser xml-utils xsltproc +BuildRequires: libpoppler-glib-devel libcurl-devel libdbus-glib-devel libhal-devel gnome-vfs-devel libXext-devel +BuildRequires: python-dev python-module-pygtk-devel libgegl-devel libbabl-devel libgio-devel libwebkit-devel + +%description +The GIMP (GNU Image Manipulation Program) is a powerful image +composition and editing program, which can be extremely useful for +creating logos and other graphics for Web pages. The GIMP has many of +the tools and filters you would expect to find in similar commercial +offerings, and some interesting extras as well. The GIMP provides a +large image manipulation toolbox, including channel operations and +layers, effects, sub-pixel imaging and anti-aliasing, and conversions, +all with multi-level undo. + +%package -n lib%name +Summary: GIMP libraries +Group: System/Libraries +License: LGPL +Obsoletes: libgimp2 < %version-%release +Provides: libgimp2 = %version-%release + +%description -n lib%name +Libraries used to communicate between The GIMP and other programs which +may function as "GIMP plugins". + +%package -n lib%name-devel +Summary: GIMP plugin and extension development kit +Group: Graphics +Requires: lib%name = %version-%release +Obsoletes: libgimp2-devel < %version-%release +Provides: libgimp2-devel = %version-%release + +%description -n lib%name-devel +Development libraries and header files for writing GIMP plugins and extensions. + +%prep +%setup -q +%patch -p1 + +%build +gtkdocize +%autoreconf +%configure \ + --enable-gimp-remote \ + --enable-gtk-doc \ + --disable-gimp-console \ + --without-poppler \ + --enable-python + +%make_build + +%install +%make DESTDIR=%buildroot install + +mkdir -p %buildroot%_datadir/create/ +ln -s ../%name/2.0/brushes %buildroot%_datadir/create/brushes +ln -s ../%name/2.0/gradients %buildroot%_datadir/create/gradients +ln -s ../%name/2.0/patterns %buildroot%_datadir/create/patterns + +find %buildroot%_libdir/%name -name \*.la -delete + +# Execute find_lang for all components and merge the resulting lists +%find_lang --output=global.lang gimp20 gimp20-libgimp gimp20-std-plug-ins gimp20-script-fu gimp20-tips gimp20-python + +%files -f global.lang +%doc AUTHORS NEWS README README.i18n +%dir %_sysconfdir/%name +%dir %_sysconfdir/%name/%oldver +%config %_sysconfdir/%name/%oldver/* +%_bindir/%name +%_bindir/%name-* +%dir %_libdir/%name +%dir %_libdir/%name/%oldver +%_libdir/%name/%oldver/modules +%_libdir/%name/%oldver/plug-ins +%_libdir/%name/%oldver/environ +%_libdir/%name/%oldver/interpreters +%_libdir/%name/%oldver/python +%_datadir/%name +%dir %_datadir/create +%_datadir/create/* +%_iconsdir/hicolor/*/apps/* +%_desktopdir/%name.desktop +%_man1dir/* +%_man5dir/* + +%files -n lib%name +%_libdir/*.so.* + +%files -n lib%name-devel +%_datadir/gtk-doc/html/* +%_includedir/* +%_bindir/gimptool* +%_libdir/*.so +%_pkgconfigdir/* +%_datadir/aclocal/* + +%changelog +* Wed Apr 15 2009 Valery Inozemtsev 2.6.6-alt2 +- rebuild with libwebkit-1.0.so.2 + +* Wed Mar 18 2009 Valery Inozemtsev 2.6.6-alt1 +- 2.6.6 + +* Mon Feb 16 2009 Valery Inozemtsev 2.6.5-alt1 +- 2.6.5 + +* Tue Jan 27 2009 Valery Inozemtsev 2.6.4-alt2 +- enabled gimp-remote + +* Thu Jan 01 2009 Valery Inozemtsev 2.6.4-alt1 +- 2.6.4 + +* Sat Nov 22 2008 Valery Inozemtsev 2.6.3-alt1 +- 2.6.3 + +* Tue Nov 04 2008 Valery Inozemtsev 2.6.2-alt2 +- fixed gimptool (close #17783) + +* Thu Oct 30 2008 Valery Inozemtsev 2.6.2-alt1 +- 2.6.2 + +* Fri Oct 10 2008 Valery Inozemtsev 2.6.1-alt1 +- 2.6.1 + +* Wed Oct 01 2008 Valery Inozemtsev 2.6.0-alt1 +- 2.6.0 + +* Sat Aug 23 2008 Valery Inozemtsev 2.4.7-alt2 +- build without poppler + +* Fri Aug 22 2008 Valery Inozemtsev 2.4.7-alt1 +- 2.4.7 + +* Sun Jun 01 2008 Valery Inozemtsev 2.4.6-alt1 +- 2.4.6 + +* Thu May 15 2008 Valery Inozemtsev 2.4.5-alt2 +- rebuild with poppler-0.8.0 + +* Sun Mar 02 2008 Valery Inozemtsev 2.4.5-alt1 +- 2.4.5 + +* Fri Feb 01 2008 Valery Inozemtsev 2.4.4-alt1 +- 2.4.4 + +* Mon Dec 17 2007 Valery Inozemtsev 2.4.3-alt1 +- 2.4.3 + +* Sat Dec 08 2007 Valery Inozemtsev 2.4.2-alt2 +- fixed menu (bug #13610) + +* Thu Nov 22 2007 Valery Inozemtsev 2.4.2-alt0.M40.1 +- build for branch 4.0 +- added conflicts to gimp2-perl (close #13364) + +* Wed Nov 21 2007 Valery Inozemtsev 2.4.2-alt1 +- 2.4.2 + +* Sat Nov 03 2007 Valery Inozemtsev 2.4.1-alt1 +- 2.4.1 + +* Wed Oct 24 2007 Valery Inozemtsev 2.4.0-alt1 +- 2.4.0 release + +* Fri Sep 28 2007 Valery Inozemtsev 2.4.0-alt0.rc3 +- 2.4.0 RC3 + +* Mon Aug 20 2007 Valery Inozemtsev 2.2.17-alt2 +- relocated gimprc.5 manpage to gimp +- added %%update_menus in %%post + +* Mon Jul 16 2007 Valery Inozemtsev 2.2.17-alt0.M40 +- build for branch 4.0 + +* Sun Jul 15 2007 Valery Inozemtsev 2.2.17-alt1 +- Bugs fixed in GIMP 2.2.17: + + fixed regression in PSD load plug-in (bug #456042) + + fixed crash when loading a corrupt PSD file (bug #327444) + + work around for Pango appending " Not-Rotated" to font names +- Bugs fixed in GIMP 2.2.16: + + improved input value validation in several file plug-ins (bug #453973) + + improved handling of corrupt or invalid XCF files + + guard against integer overflows in several file plug-ins (bug #451379) + + fixed handling of background alpha channel in XCF files (bug #443097) + + improved forward compatibility of the config parser + + fixed crash when previewing some animated brushes (bug #446005) + +* Tue Jul 03 2007 Valery Inozemtsev 2.2.15-alt2 +- fixed CVE-2007-2949 + +* Mon May 28 2007 Valery Inozemtsev 2.2.15-alt1 +- 2.2.15: + + fixed parsing of GFig files with CRLF line endings (bug #346988) + + guard against a possible stack overflow in the Sunras loader (bug #433902) + + fixed definition of datarootdir in gimptool-2.0 (bug #436386) + + fixed Perspective tool crash on Mac OS X (bug #349483) + + fixed area resizing in the Image Map plug-in (bug #439222) + + added missing library in gimptool-2.0 --libs output + + added new localizations: Occitan and Persian + +* Mon May 21 2007 Valery Inozemtsev 2.2.14-alt3 +- build without gimp-print, used gimp-plugin-gutenprint + +* Sun May 20 2007 Valery Inozemtsev 2.2.14-alt2 +- added gimp-2.2.14-sunras-overflow.patch: avoid buffer overflow in sunras plugin + +* Sat May 05 2007 Valery Inozemtsev 2.2.14-alt1 +- 2.2.14 +- rename gimp2 to gimp +- added Tango themes by defaults +- build with python + +* Sun Feb 11 2007 Anatoly Yakushin 2.2.13-alt2 +- L. A. Kostis 2.2.13-alt2 + NMU: + + move gimptool to -devel subpackage (closes #9955). + +* Mon Oct 23 2006 Anatoly Yakushin 2.2.13-alt1 +- 2.2.13 + +* Mon Jun 19 2006 Anatoly Yakushin 2.2.11-alt1 +- 2.2.11 + +* Sun Jun 18 2006 Valery Inozemtsev 2.2.11-alt0.1 +- 2.2.11 +- updated build dependencies +- move to freedesktop menu +- disabled MMX/SSE + +* Thu Feb 02 2006 ALT QA Team Robot 2.2.10-alt1.1 +- Rebuilt for new pkg-config dependencies. + +* Fri Jan 06 2006 Anatoly Yakushin 2.2.10-alt1 +- new version. Fixed russian translation bug # 123410 + +* Wed May 11 2005 Anatoly Yakushin 2.2.7-alt1 +- new stable version + +* Mon Apr 25 2005 Anatoly Yakushin 2.2.6-alt1 +- update ru po +- Yuri N. Sedunov has added + - 2.2.6 + - rebuild against libexif.so.12. + - svg support via librsvg2 enabled. + - requires gtk+ >= 2.2.4 + - fixed source url. + +* Sun Mar 13 2005 Anatoly Yakushin 2.2.4-alt1 +- new stable version, minor bugs fixed. + +* Tue Jan 11 2005 Anatoly Yakushin 2.2.2-alt1 +- new stable version, minor bugs fixed. + +* Mon Jan 10 2005 Anatoly Yakushin 2.2.1-alt1 +- new stable version +- update ru translation + +* Sun Nov 21 2004 Anatoly Yakushin 2.2-alt0.1.pre2 +- new developer version + +* Tue Nov 09 2004 Anatoly Yakushin 2.2-alt0.1.pre1 +- new developer version + +* Sun Oct 03 2004 Anatoly Yakushin 2.0.5-alt1 +- new stable version + +* Tue Sep 07 2004 Anatoly Yakushin 2.0.4-alt1 +- new stable version + +* Sat Jul 24 2004 Anatoly Yakushin 2.0.3-alt2 +- fixed bug - don't open and save non latin1 or utf-8 filename + +* Sun Jul 18 2004 Anatoly Yakushin 2.0.3-alt1 +- new version +- remove gimp.desktop from src.rpm. +- convert gimp.xpm to gimp.png, install it in /usr/share/pixmaps as menu icon +- remove unusual %%clean section. +- use post{un}_ldconfig macros for libgimp2 subpackage. +- optimize find-lang call. +- allow SMP build. +- clean %%install section +- fix %%files to remove %%_libdir/*.so from libgimp2 subpackage. +- clean .spec using cleanup_spec and manually. +- Special thanks Yuri N. Sedunov aka Aris for his help. + +* Thu Jun 24 2004 Anatoly Yakushin 2.0.2-alt1 +- new version, bug # 3459 fixed + +* Mon May 10 2004 Anatoly Yakushin 2.0.1-alt2 +- spec cleanup, po bugs fixed + +* Wed Apr 21 2004 Anatoly Yakushin 2.0.1-alt1 +- Bugs fixed version GIMP 2.0.1 + +* Wed Mar 24 2004 Anatoly Yakushin 2.0.0-alt1 +- GIMP 2.0.0 new stable build + +* Sun Mar 07 2004 Anatoly Yakushin 2.0-alt0.3.pre4 +- new version + +* Sun Feb 8 2004 Anatoly Yakushin 2.0-alt0.2.pre3 +- add color proof + +* Mon Nov 10 2003 Anatoly Yakushin 1.3.22-alt1 +- new version, spec cleanup + +* Mon Oct 13 2003 Anatoly Yakushin 1.3.21-alt1 +- new version + +* Tue Aug 30 2003 Anatoly Yakushin 1.3.19-alt1 +- new version + +* Mon Jun 29 2003 Anatoly Yakushin 1.3.16-alt1 +- new version + +* Wed May 28 2003 Anatoly Yakushin 1.3.14-alt2 +- fixed bugs in spec file, add new ru.po + +* Sun Apr 13 2003 Anatoly Yakushin 1.3.14-alt1 +- package in Sisyphus + +* Mon Mar 24 2003 Anatoly Yakushin 1.3.13-alt0.1 +- version 1.3.13 + +* Wed Mar 19 2003 Anatoly Yakushin 1.3.12-alt0.1 +- Adapted spec for AltLinux + +* Fri Feb 14 2003 Matthias Saou +- Reinvented the wheel, but packaged 1.3.11. + +* Fri Apr 14 2000 Matt Wilson +- include subdirs in the help find +- remove gimp-help-files generation +- both gimp and gimp-perl own prefix/lib/gimp/1.1/plug-ins +- both gimp and gimp-devel own prefix/lib/gimp/1.1 and + prefix/lib/gimp/1.1/modules + +* Thu Apr 13 2000 Matt Wilson +- 1.1.19 +- get all .mo files + +* Wed Jan 19 2000 Gregory McLean +- Version 1.1.15 + +* Wed Dec 22 1999 Gregory McLean +- Version 1.1.14 +- Added some auto %files section generation scriptlets + diff --git a/tools/Makefile.am b/tools/Makefile.am index 997c4b9..84718e5 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -72,6 +72,7 @@ EXTRA_DIST = \ install-exec-hook: + $(LN_S) gimptool-@GIMP_TOOL_VERSION@ $(DESTDIR)$(bindir)/gimptool if DEFAULT_BINARY if test -f "$(DESTDIR)$(bindir)/gimp-remote-@GIMP_APP_VERSION@"; then \ echo "cd $(DESTDIR)$(bindir)"; \ diff --git a/tools/gimptool.c b/tools/gimptool.c index 1adddd2..b674da8 100644 --- a/tools/gimptool.c +++ b/tools/gimptool.c @@ -52,7 +52,7 @@ static const gchar *env_cc; static const gchar *env_cflags; static const gchar *env_ldflags; static const gchar *env_libs; - +static const gchar *env_destdir; #ifdef G_OS_WIN32 #define EXEEXT ".exe" @@ -277,6 +277,11 @@ find_out_env_flags (void) env_libs = p; else env_libs = ""; + + if ((p = getenv ("DESTDIR")) != NULL) + env_destdir = p; + else + env_destdir = ""; } static void @@ -567,9 +572,8 @@ get_sys_plugin_dir (gboolean forward_slashes) const gchar slash = '/'; #endif - return g_strdup_printf ("%s%clib%cgimp%c" GIMP_PLUGIN_VERSION "%cplug-ins", - get_runtime_prefix (slash), - slash, slash, slash, slash); + return g_strdup_printf (LIBDIR "%cgimp%c" GIMP_PLUGIN_VERSION "%cplug-ins", + slash, slash, slash); } static void @@ -594,6 +598,9 @@ static void do_install_bin_2 (const gchar *dir, const gchar *what) { + if ( env_destdir != NULL ) + dir = g_strconcat (env_destdir, dir, NULL); + g_mkdir_with_parents (dir, S_IRUSR | S_IXUSR | S_IWUSR | S_IRGRP | S_IXGRP |