[Gpg4win-commits] r336 - in trunk: . include packages src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Aug 2 23:42:56 CEST 2006
Author: marcus
Date: 2006-08-02 23:42:56 +0200 (Wed, 02 Aug 2006)
New Revision: 336
Added:
trunk/src/inst-jpeg.nsi
trunk/src/uninst-jpeg.nsi
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/include/config.nsi.in
trunk/packages/packages.current
trunk/src/Makefile.am
trunk/src/inst-sections.nsi
Log:
2006-08-02 Marcus Brinkmann <marcus at g10code.de>
* packages/packages.current: Add jpeg packages.
* src/inst-sections.nsi: Add jpeg support.
* src/Makefile.am (gpg4win_bpkgs): Add jpeg.
* src/inst-jpeg.nsi, src/uninst-jpeg.nsi: New file.
* include/config.nsi.in: Add defines for jpeg.
* configure.ac: Add new GnuWin32 package jpeg. Add it as a
dependency to sylpheed-claws.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-08-02 21:11:09 UTC (rev 335)
+++ trunk/ChangeLog 2006-08-02 21:42:56 UTC (rev 336)
@@ -1,3 +1,13 @@
+2006-08-02 Marcus Brinkmann <marcus at g10code.de>
+
+ * packages/packages.current: Add jpeg packages.
+ * src/inst-sections.nsi: Add jpeg support.
+ * src/Makefile.am (gpg4win_bpkgs): Add jpeg.
+ * src/inst-jpeg.nsi, src/uninst-jpeg.nsi: New file.
+ * include/config.nsi.in: Add defines for jpeg.
+ * configure.ac: Add new GnuWin32 package jpeg. Add it as a
+ dependency to sylpheed-claws.
+
2006-08-02 Werner Koch <wk at g10code.com>
Released 1.0.5.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2006-08-02 21:11:09 UTC (rev 335)
+++ trunk/configure.ac 2006-08-02 21:42:56 UTC (rev 336)
@@ -142,6 +142,7 @@
GPG4WIN_BPKG_GNUWIN32_LIB([crypt])
GPG4WIN_BPKG_GNUWIN32_LIB([regex])
GPG4WIN_BPKG_GNUWIN32([libpng], [pkgconfig])
+GPG4WIN_BPKG_GNUWIN32([jpeg])
GPG4WIN_BPKG_GTK([pkgconfig])
# We build our own version of glib, because we need to patch giowin32.c.
@@ -159,7 +160,7 @@
GPG4WIN_SPKG([gpgol], [gpgme])
GPG4WIN_SPKG([gpa], [libiconv gettext zlib gtk+ libpng glib gpgme])
GPG4WIN_SPKG([winpt], [gpgme gnupg])
-GPG4WIN_SPKG([sylpheed-claws], [libiconv gettext zlib gtk+ libpng glib dnl
+GPG4WIN_SPKG([sylpheed-claws], [libiconv gettext zlib gtk+ libpng jpeg glib dnl
gpgme pthreads-w32 crypt regex])
# The Eudora license (the one for thye EMS API) is still not acceptable.
#GPG4WIN_SPKG([eudoragpg])
Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in 2006-08-02 21:11:09 UTC (rev 335)
+++ trunk/include/config.nsi.in 2006-08-02 21:42:56 UTC (rev 336)
@@ -112,6 +112,12 @@
!define gpg4win_pkg_libpng_dev @gpg4win_pkg_libpng_dev@
!define gpg4win_pkg_libpng_src @gpg4win_pkg_libpng_src@
+ at HAVE_PKG_JPEG@
+!define gpg4win_pkg_jpeg @gpg4win_pkg_jpeg@
+!define gpg4win_pkg_jpeg_version @gpg4win_pkg_jpeg_version@
+!define gpg4win_pkg_jpeg_dev @gpg4win_pkg_jpeg_dev@
+!define gpg4win_pkg_jpeg_src @gpg4win_pkg_jpeg_src@
+
@HAVE_PKG_PKGCONFIG@
!define gpg4win_pkg_pkgconfig @gpg4win_pkg_pkgconfig@
!define gpg4win_pkg_pkgconfig_version @gpg4win_pkg_pkgconfig_version@
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2006-08-02 21:11:09 UTC (rev 335)
+++ trunk/packages/packages.current 2006-08-02 21:42:56 UTC (rev 336)
@@ -51,6 +51,13 @@
file libpng-1.2.8-src.zip
chk f00a86596d804fb62e912cf575983124692858fa
+file jpeg-6b-4-bin.zip
+chk d6309212c783cffe8ea9d2c7c8913b69709796fe
+file jpeg-6b-4-lib.zip
+chk 858cbedcefcc265e5eec35a5c7a20bcde3de4399
+file jpeg-6b-4-src.zip
+chk fb46e04938e28bc1ecea1e7bb8b92414129faf96
+
file crypt-2.2.5-lib.zip
chk 77482f40ce2c65c0e1b807a07049f53823861266
file crypt-2.2.5-src.zip
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2006-08-02 21:11:09 UTC (rev 335)
+++ trunk/src/Makefile.am 2006-08-02 21:42:56 UTC (rev 336)
@@ -1,5 +1,5 @@
# Makefile.am - Installer for GnuPG 4 Windows Makefile.
-# Copyright (C) 2005 g10 Code GmbH
+# Copyright (C) 2005, 2006 g10 Code GmbH
#
# This file is part of GPG4Win.
#
@@ -93,7 +93,7 @@
# Supported binary packages.
-gpg4win_bpkgs := libiconv gettext pkgconfig zlib libpng pango atk gtk+ \
+gpg4win_bpkgs := libiconv gettext pkgconfig zlib libpng jpeg pango atk gtk+ \
gpgee crypt regex
# libiconv needs some special magic to generate a usable import
Added: trunk/src/inst-jpeg.nsi
===================================================================
--- trunk/src/inst-jpeg.nsi 2006-08-02 21:11:09 UTC (rev 335)
+++ trunk/src/inst-jpeg.nsi 2006-08-02 21:42:56 UTC (rev 336)
@@ -0,0 +1,47 @@
+# inst-libpng.nsi - Installer snippet for jpeg. -*- coding: latin-1; -*-
+# Copyright (C) 2005, 2006 g10 Code GmbH
+#
+# This file is part of GPG4Win.
+#
+# GPG4Win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# GPG4Win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/jpeg-${gpg4win_pkg_jpeg_version}
+
+!ifdef DEBUG
+Section "jpeg" SEC_jpeg
+!else
+Section "-jpeg" SEC_jpeg
+!endif
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_jpeg_src}"
+!else
+ File ${prefix}/bin/jpeg62.dll
+!ifdef DEBUG
+ # We install a couple of binaries that may be useful for testing.
+ File ${prefix}/bin/cjpeg.exe
+ File ${prefix}/bin/djpeg.exe
+ File ${prefix}/bin/exifautotran
+ File ${prefix}/bin/jpegexiforient.exe
+ File ${prefix}/bin/jpegtran.exe
+ File ${prefix}/bin/rdjpgcom.exe
+ File ${prefix}/bin/wrjpgcom.exe
+!endif
+!endif
+SectionEnd
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2006-08-02 21:11:09 UTC (rev 335)
+++ trunk/src/inst-sections.nsi 2006-08-02 21:42:56 UTC (rev 336)
@@ -1,5 +1,5 @@
# inst-sections.nsi - Installer for GPG4Win sections. -*- coding: latin-1; -*-
-# Copyright (C) 2005 g10 Code GmbH
+# Copyright (C) 2005, 2006 g10 Code GmbH
#
# This file is part of GPG4Win.
#
@@ -57,6 +57,9 @@
!ifdef HAVE_PKG_LIBPNG
!include "inst-libpng.nsi"
!endif
+!ifdef HAVE_PKG_JPEG
+!include "inst-jpeg.nsi"
+!endif
!ifdef HAVE_PKG_GPGOL
!include "inst-gpgol.nsi"
!endif
@@ -129,6 +132,9 @@
!ifdef HAVE_PKG_LIBPNG
!include "uninst-libpng.nsi"
!endif
+!ifdef HAVE_PKG_JPEG
+!include "uninst-jpeg.nsi"
+!endif
!ifdef HAVE_PKG_GLIB
!include "uninst-glib.nsi"
!endif
@@ -199,6 +205,9 @@
!ifdef HAVE_PKG_LIBPNG
!insertmacro UnselectSection ${SEC_libpng}
!endif
+!ifdef HAVE_PKG_JPEG
+ !insertmacro UnselectSection ${SEC_jpeg}
+!endif
!ifdef HAVE_PKG_PKGCONFIG
!insertmacro UnselectSection ${SEC_pkgconfig}
!endif
@@ -257,6 +266,7 @@
!insertmacro SelectSection ${SEC_zlib}
!insertmacro SelectSection ${SEC_gtk_}
!insertmacro SelectSection ${SEC_libpng}
+ !insertmacro SelectSection ${SEC_jpeg}
!insertmacro SelectSection ${SEC_glib}
!insertmacro SelectSection ${SEC_gpgme}
!insertmacro SelectSection ${SEC_gnupg}
Added: trunk/src/uninst-jpeg.nsi
===================================================================
--- trunk/src/uninst-jpeg.nsi 2006-08-02 21:11:09 UTC (rev 335)
+++ trunk/src/uninst-jpeg.nsi 2006-08-02 21:42:56 UTC (rev 336)
@@ -0,0 +1,45 @@
+# uninst-jpeg.nsi - Installer snippet for jpeg. -*- coding: latin-1; -*-
+# Copyright (C) 2005, 2006 g10 Code GmbH
+#
+# This file is part of GPG4Win.
+#
+# GPG4Win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# GPG4Win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/jpeg-${gpg4win_pkg_jpeg_version}
+
+
+; Uninstaller section.
+Section "-un.jpeg"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_jpeg_src}"
+ Call un.SourceDelete
+!else
+ Delete "$INSTDIR\jpeg62.dll"
+!ifdef DEBUG
+ Delete "$INSTDIR\cjpeg.exe"
+ Delete "$INSTDIR\djpeg.exe"
+ Delete "$INSTDIR\exifautotran"
+ Delete "$INSTDIR\jpegexiforient.exe"
+ Delete "$INSTDIR\jpegtran.exe"
+ Delete "$INSTDIR\rdjpgcom.exe"
+ Delete "$INSTDIR\wrjpgcom.exe"
+!endif
+ RMDir "$INSTDIR"
+!endif
+SectionEnd
More information about the Gpg4win-commits
mailing list