[cvs] dists/10.7/stable/main/finkinfo/graphics gqview.patch, NONE, 1.1 gqview.info, 1.3, 1.4
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28761 Modified Files: gqview.info Added Files: gqview.patch Log Message: dep cleanup, clear some clang warnings Index: gqview.info === RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/gqview.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- gqview.info 13 Jul 2013 16:00:42 - 1.3 +++ gqview.info 23 Jul 2013 07:18:41 - 1.4 @@ -1,19 +1,46 @@ Package: gqview Version: 2.1.5 -Revision: 4 -Depends: atk1-shlibs (= 1.20.0-1), freetype219-shlibs (= 2.3.5-1), libgettext8-shlibs, glib2-shlibs (= 2.14.0-1), gtk+2-shlibs (= 2.12.0-1), libiconv, pango1-xft2-ft219-shlibs (= 1.18.4-4) -BuildDepends: glitz, expat1, libpng14, cairo (= 1.6-1), fontconfig2-dev (= 2.4.1-1), xft2-dev, freetype219 (= 2.3.5-1), atk1 (= 1.20.0-1), gettext-bin, gettext-tools, libgettext8-dev, glib2-dev (= 2.14.0-1), gtk+2-dev (= 2.12.0-1), libiconv-dev, pango1-xft2-ft219-dev (= 1.18.4-4), pixman (= 0.10.0-1), pkgconfig (= 0.21-1), x11-dev +Revision: 5 +Depends: + atk1-shlibs (= 1.28.0-1), + cairo-shlibs (= 1.12.8-1), + fontconfig2-shlibs (= 2.10.0-1), + freetype219-shlibs (= 2.4.11-1), + glib2-shlibs (= 2.22.0-1), + gtk+2-shlibs (= 2.18.0-1), + lcms-shlibs, + libgettext8-shlibs, + pango1-xft2-ft219-shlibs (= 1.24.5-4), + x11 + +BuildDepends: + atk1 (= 1.28.0-1), + cairo (= 1.12.8-1), + fink-package-precedence, + fontconfig2-dev (= 2.10.0-1), + freetype219 (= 2.4.11-1), + gettext-tools, + glib2-dev (= 2.22.0-1), + gtk+2-dev (= 2.18.0-1), + libgettext8-dev, + pango1-xft2-ft219-dev (= 1.24.5-4), + pkgconfig (= 0.21-1), + x11-dev + Replaces: gqview-unstable Source: mirror:sourceforge:gqview/gqview-%v.tar.gz Source-MD5: 4644187d9b14b1dc11ac3bb146f262ea -PatchScript: perl -pi -e 's/-I\$\(builddir\)//' src/Makefile.in -SetLIBS: -L/usr/X11R6/lib -lX11 -lXext -ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking PKG_CONFIG_PATH=%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config +PatchFile: %n.patch +PatchFile-MD5: d913cbef850989c9ac8785fedc03d625 +ConfigureParams: --mandir=%p/share/man --enable-dependency-tracking +CompileScript: + %{default_script} + fink-package-precedence . + InstallScript: - make install DESTDIR=%d - rm -rf %i/lib %i/share/gqview %i/share/locale/locale.alias + make install DESTDIR=%d -DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README TODO +DocFiles: AUTHORS COPYING ChangeLog NEWS README TODO License: GPL Description: Browser for graphics files DescDetail: @@ -30,8 +57,6 @@ be all set. DescPackaging: -gqview builds under OS X with no special modifications. - dmacks: No such autotools variable $builddir, but build dir is . and already automatically included --- NEW FILE: gqview.patch --- diff -Nurd -x'*~' gqview-2.1.5.orig/src/Makefile.in gqview-2.1.5/src/Makefile.in --- gqview-2.1.5.orig/src/Makefile.in 2006-12-02 20:41:25.0 -0500 +++ gqview-2.1.5/src/Makefile.in2013-07-23 03:09:59.0 -0400 @@ -198,7 +198,7 @@ target_alias = @target_alias@ SUBDIRS = icons DIST_SUBDIRS = icons -INCLUDES = -I$(srcdir) -I$(builddir)\ +INCLUDES = -I$(srcdir)\ -I$(top_srcdir) -I$(top_builddir) \ -I$(includedir) $(GTK_CFLAGS) diff -Nurd -x'*~' gqview-2.1.5.orig/src/print.c gqview-2.1.5/src/print.c --- gqview-2.1.5.orig/src/print.c 2006-12-01 14:00:42.0 -0500 +++ gqview-2.1.5/src/print.c2013-07-23 03:06:22.0 -0400 @@ -1220,7 +1220,7 @@ } text[6] = '\0'; - fprintf(f, text); + fprintf(f, %s, text); } static gint print_job_ps_page_image(PrintWindow *pw, GdkPixbuf *pixbuf, gdouble x, gdouble y, gdouble w, gdouble h, @@ -1345,7 +1345,7 @@ text[1] = hex_digits[*p 0xf]; text[2] = '\0'; - fprintf(f, text); + fprintf(f, %s, text); p++; } diff -Nurd -x'*~' gqview-2.1.5.orig/src/remote.c gqview-2.1.5/src/remote.c --- gqview-2.1.5.orig/src/remote.c 2005-08-15 17:06:37.0 -0400 +++ gqview-2.1.5/src/remote.c 2013-07-23 03:16:57.0 -0400 @@ -52,7 +52,7 @@ GList *work; gchar *buffer = NULL; GError *error = NULL; - guint termpos; + gsize termpos; while (g_io_channel_read_line(source, buffer, NULL,
[cvs] dists/10.7/stable/main/finkinfo/graphics gpaint2.info,1.1,1.2
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29371 Modified Files: gpaint2.info Log Message: dep upgrades Index: gpaint2.info === RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/gpaint2.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gpaint2.info7 Aug 2011 16:33:51 - 1.1 +++ gpaint2.info23 Jul 2013 07:38:33 - 1.2 @@ -1,74 +1,73 @@ Package: gpaint2 Version: 0.3.3 -Revision: 1 +Revision: 2 Source: ftp://alpha.gnu.org/gnu/gpaint/gpaint-2-%v.tar.gz Source-MD5: 037cc283d2cdd806dbdc462839bb3b72 -Source2: mirror:debian:pool/main/g/gpaint/gpaint_%v-2.diff.gz -Source2-MD5: c304d111a5be018366e1f7cdcfcd30ea +Source2: mirror:debian:pool/main/g/gpaint/gpaint_%v-6.debian.tar.gz +Source2-MD5: 24bd13fad4d373584066a6bbb072578f Depends: - atk1-shlibs (= 1.24.0-1), - cairo-shlibs (= 1.8-1), - expat1-shlibs, - fontconfig2-shlibs (= 2.4.1-1), - freetype219-shlibs (= 2.3.7-7), - glib2-shlibs (= 2.18.0-1), - glitz-shlibs, - gtk+2-shlibs (= 2.14.0-1), + atk1-shlibs (= 1.28.0-1), + cairo-shlibs (= 1.12.8-1), + fontconfig2-shlibs (= 2.10.0-1), + freetype219-shlibs (= 2.4.11-1), + glib2-shlibs (= 2.22.0-1), + gtk+2-shlibs (= 2.18.0-1), libgettext8-shlibs, - libglade2-shlibs (= 2.6.3-1), - libiconv, - libpng15-shlibs, - libxml2-shlibs (= 2.6.30-1), - pango1-xft2-ft219-shlibs (= 1.22.0-4), - pixman-shlibs (= 0.12.0-1), - x11-shlibs + libglade2-shlibs (= 2.6.4-7), + libxml2-shlibs (= 2.9.1-1), + pango1-xft2-ft219-shlibs (= 1.24.5-4) BuildDepends: - atk1 (= 1.24.0-1), - cairo (= 1.8-1), - expat1, - fink (= 0.24.12), - fontconfig2-dev (= 2.4.1-1), - freetype219 (= 2.3.7-7), + atk1 (= 1.28.0-1), + cairo (= 1.12.8-1), + fink-package-precedence, + fontconfig2-dev (= 2.10.0-1), + freetype219 (= 2.4.11-1), gettext-bin, gettext-tools, - glib2-dev (= 2.18.0-1), - glitz, - gtk+2-dev (= 2.14.0-1), + glib2-dev (= 2.22.0-1), + gtk+2-dev (= 2.18.0-1), libgettext8-dev, - libglade2 (= 2.6.3-1), - libiconv-dev, - libpng15, - libxml2 (= 2.6.30-1), - pango1-xft2-ft219-dev (= 1.22.0-4), - pixman (= 0.12.0-1), + libglade2 (= 2.6.4-7), + libxml2 (= 2.9.1-1), + pango1-xft2-ft219-dev (= 1.24.5-4), pkgconfig (= 0.23), - x11-dev, - xft2-dev + x11-dev PatchFile: %n.patch PatchFile-MD5: 73f8a1662107a5d1e0a06a16feb3f04c PatchScript: #!/bin/sh -ev - gzip -dc ../gpaint_%v-2.diff.gz | patch -p1 for file in \ - 01_drawing.dpatch \ - 02_remove_menu_h_reference.dpatch \ - 09_fix_menu_entry.dpatch \ - 10_fix_crash_on_font_select.dpatch \ - 11_fix_image_rotation.dpatch \ - 20_fix_line_width_combo.dpatch \ + 01_drawing.diff \ + 02_remove_menu_h_reference.diff \ + 09_fix_menu_entry.diff \ + 10_fix_crash_on_font_select.diff \ + 11_fix_image_rotation.diff \ + 20_fix_line_width_combo.diff \ + 21_fix_crash_on_fill_button_click.diff \ + 22_fix_not_printable_string.diff \ + 23_add_accelerator_keys.diff \ + 24_fix_crash_on_failed_write.diff \ + 25_fix_color_selection.diff \ + 26_fix_toolbar.diff \ ; do echo applying $file - patch -p1 debian/patches/$file + patch -p1 ../debian/patches/$file done %{default_script} -ConfigureParams: --disable-dependency-tracking PKG_CONFIG_PATH=%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH +SetCPPFLAGS: -MD +CompileScript: + %{default_script} + fink-package-precedence --depfile-ext='\.d' . + InstallScript: -install -d -m 755 %i/share/applications -install -c -m 644 gpaint.desktop %i/share/applications - make install DESTDIR=%d + make install DESTDIR=%d + mkdir -p %i/share/applications + install -m 644 gpaint.desktop %i/share/applications + mkdir -p %i/share/man/man1 + install -m 644 ../debian/gpaint.1 %i/share/man/man1 DocFiles: ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README THANKS TODO Description: Simple, easy-to-use paint program @@ -92,8 +91,6 @@ Launch it with gpaint-2 DescPort: - Have to install the desktop file by hand - Nuke linker flag we don't have on darwin. License: GPL @@ -104,6 +101,9 @@ detection of latter and avoid passing any flags for it. Grab debian's patches for modern gnome2 and other fixes. + + Have to
[cvs] dists/10.7/stable/main/finkinfo/libs/perlmods net-ssh2-pm.info, 1.7, 1.8
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/perlmods In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5935 Modified Files: net-ssh2-pm.info Log Message: New upstream net-ssh2-pm 0.49. Index: net-ssh2-pm.info === RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/perlmods/net-ssh2-pm.info,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- net-ssh2-pm.info29 Jun 2013 22:47:44 - 1.7 +++ net-ssh2-pm.info23 Jul 2013 11:21:08 - 1.8 @@ -1,6 +1,6 @@ Info2: Package: net-ssh2-pm%type_pkg[perl] -Version: 0.48 +Version: 0.49 Revision: 1 License: Artistic/GPL @@ -9,17 +9,14 @@ Homepage: http://search.cpan.org/dist/Net-SSH2/ Source: mirror:cpan:authors/id/R/RK/RKITOVER/Net-SSH2-%v.tar.gz -Source-MD5: 40cde5d0837af0e1ab3db7725ea58014 +Source-MD5: 89c52b65ca6ef774ebd3c29344b34516 Type: perl (5.12.3 5.12.4) -Depends: libssh2.1-shlibs (= 1.4.1-1), perl%type_pkg[perl]-core -BuildDepends: libssh2.1 (= 1.4.1-1), fink (= 0.29.0) +Depends: libssh2.1-shlibs (= 1.4.1-1), perl%type_pkg[perl]-core, openssl100-shlibs (= 1.0.1e-1) +BuildDepends: libssh2.1 (= 1.4.1-1), fink (= 0.29.0), extutils-makemaker-pm%type_pkg[perl] (= 6.59-1), openssl100-dev (= 1.0.1e-1) -PatchScript: - perl -pi -e 's/-lz -lssl -lcrypto//' Makefile.PL - perl -pi -e s|'/usr'|'%p'| Makefile.PL - +ConfigureParams: lib=%p/lib inc=%p/include UpdatePOD: true -- See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831iu=/4140/ostg.clktrk ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs
[cvs] dists/10.4/stable/main/finkinfo/libs/perlmods net-ssh2-pm.info, 1.7, 1.8
Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/perlmods In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5986 Modified Files: net-ssh2-pm.info Log Message: New upstream net-ssh2-pm 0.49. Index: net-ssh2-pm.info === RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/perlmods/net-ssh2-pm.info,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- net-ssh2-pm.info10 Jul 2013 23:05:48 - 1.7 +++ net-ssh2-pm.info23 Jul 2013 11:21:25 - 1.8 @@ -1,6 +1,6 @@ Info2: Package: net-ssh2-pm%type_pkg[perl] -Version: 0.48 +Version: 0.49 Revision: 1 License: Artistic/GPL @@ -9,17 +9,14 @@ Homepage: http://search.cpan.org/dist/Net-SSH2/ Source: mirror:cpan:authors/id/R/RK/RKITOVER/Net-SSH2-%v.tar.gz -Source-MD5: 40cde5d0837af0e1ab3db7725ea58014 +Source-MD5: 89c52b65ca6ef774ebd3c29344b34516 Type: perl (5.8.8 5.10.0) -Depends: libssh2.1-shlibs (= 1.4.1-1), perl%type_pkg[perl]-core -BuildDepends: libssh2.1 (= 1.4.1-1), fink (= 0.29.0) +Depends: libssh2.1-shlibs (= 1.4.1-1), perl%type_pkg[perl]-core, openssl100-shlibs (= 1.0.1e-1) +BuildDepends: libssh2.1 (= 1.4.1-1), fink (= 0.29.0), extutils-makemaker-pm%type_pkg[perl] (= 6.59-1), openssl100-dev (= 1.0.1e-1) -PatchScript: - perl -pi -e 's/-lz -lssl -lcrypto//' Makefile.PL - perl -pi -e s|'/usr'|'%p'| Makefile.PL - +ConfigureParams: lib=%p/lib inc=%p/include UpdatePOD: true -- See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831iu=/4140/ostg.clktrk ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs
[cvs] dists/10.7/stable/main/finkinfo/x11 openmotif4.info,1.9,1.10
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/x11 In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv9774 Modified Files: openmotif4.info Log Message: use flag-sort hammer for future os Index: openmotif4.info === RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/x11/openmotif4.info,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- openmotif4.info 27 Jun 2013 02:40:55 - 1.9 +++ openmotif4.info 23 Jul 2013 12:43:12 - 1.10 @@ -26,7 +26,8 @@ libjpeg9 (= 9-3), libpng16, x11-dev, - xft2-dev (= 2.2.0-2) + xft2-dev (= 2.2.0-2), + flag-sort Depends: x11, %N-shlibs (= %v-%r), libjpeg9-shlibs (= 9-3), libpng16-shlibs, libiconv Conflicts: lesstif, lesstif-dev, openmotif3 @@ -39,6 +40,8 @@ SetCFLAGS: -I%p/include -I/usr/X11R6/include -DXNO_MTSAFE_STRINGAPI -DXNO_MTSAFE_PWDAPI -DXNO_MTSAFE_TIMEAPI SetLIBS: -L%p/lib -L/usr/X11R6/lib -lXt SetMAKEFLAGS: -j1 +SetCC: flag-sort -r gcc +SetCXX: flag-sort -r g++ ConfigureParams: --mandir=%p/share/man --enable-jpeg --with-libjpeg-includes=%p/include --with-libjpeg-lib=%p/lib -enable-png --with-libpng-includes=%p/include --with-libpng-lib=%p/lib --enable-xft --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib --enable-static RANLIB='ranlib -c' --build=%m-apple-darwin`uname -r|cut -f1 -d.` --host=%m-apple-darwin`uname -r|cut -f1 -d.` CompileScript: ./configure %c -- See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831iu=/4140/ostg.clktrk ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs
[cvs] dists/10.7/stable/main/finkinfo/languages tcltk-10.9.info, 1.1, 1.2
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/languages In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10955 Modified Files: tcltk-10.9.info Log Message: use flag-sort hammer to avoid fink-package-precedence failure Index: tcltk-10.9.info === RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/languages/tcltk-10.9.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- tcltk-10.9.info 15 Jul 2013 17:34:57 - 1.1 +++ tcltk-10.9.info 23 Jul 2013 13:01:38 - 1.2 @@ -9,7 +9,8 @@ freetype219 (= 2.4.11-1), pkgconfig (= 0.23), x11-dev, - xft2-dev (= 2.2.0-1) + xft2-dev (= 2.2.0-1), + flag-sort Depends: %N-shlibs (= %e:%v-%r), @@ -27,6 +28,8 @@ PatchFile-MD5: 4709b4a8dd6bd77bd861505896440657 NoSourceDirectory: true SetCPPFLAGS: -MD -g +SetCC: flag-sort -r gcc +SetCXX: flag-sort -r g++ ConfigureParams: --enable-shared --enable-threads --disable-corefoundation --exec-prefix=%p --mandir=%p/share/man --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib tcl_cv_type_64bit=long long InfoTest: TestScript: -- See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831iu=/4140/ostg.clktrk ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs
[cvs] dists/10.7/stable/main/finkinfo/text texlive-clangbug.patch, 1.1, NONE
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/text In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16095 Removed Files: texlive-clangbug.patch Log Message: remove unneeded texlive-clangbug.patch --- texlive-clangbug.patch DELETED --- -- See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831iu=/4140/ostg.clktrk ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs
[cvs] dists/10.7/stable/main/finkinfo/text texlive.info,1.9,1.10
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/text In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16125 Modified Files: texlive.info Log Message: remove unneeded texlive-clangbug.patch Index: texlive.info === RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/text/texlive.info,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- texlive.info11 Jul 2013 04:55:21 - 1.9 +++ texlive.info23 Jul 2013 14:19:22 - 1.10 @@ -48,12 +48,9 @@ UseMaxBuildJobs: true PatchFile: texlive.patch PatchFile-MD5: d06b3f633b64223544ebff713b663456 -PatchFile2: texlive-clangbug.patch -PatchFile2-MD5: e156e2327b4fba2b2d768dc430ca1c83 PatchScript: #!/bin/bash -ev sed 's|@PREFIX@|%p|g' %{PatchFile} | patch -d texlive -p1 - patch -p1 %{PatchFile2} # Change the directory to be installed for file in `find texlive -name Makefile.in`; do \ -- See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831iu=/4140/ostg.clktrk ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs
[cvs] dists/10.7/stable/main/finkinfo/graphics netpbm10.info,1.7,1.8
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17319 Modified Files: netpbm10.info Log Message: netpbm10 10.47.45 bump deps turn on tests. some tests give incorrect results, but there's no easy way to make the testsuite fail because the tests just ouput text Index: netpbm10.info === RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/netpbm10.info,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- netpbm10.info 13 Jun 2013 11:08:28 - 1.7 +++ netpbm10.info 23 Jul 2013 14:36:46 - 1.8 @@ -1,12 +1,12 @@ Package: netpbm10 -Version: 10.47.44 -Revision: 2 +Version: 10.47.45 +Revision: 3 BuildDepends: fink-package-precedence, libiconv-dev, libjasper.1, libjbig, - libjpeg8, + libjpeg9, libpng14, libtiff5, libxml2 @@ -23,8 +23,8 @@ BuildDependsOnly: True Source: http://www.snaggledworks.com/fink/src/netpbm-%v.tar.bz2 -Source-MD5: 200cc18f9635d41e8bc9a2f37c9efe8c -Source-Checksum: SHA1(d10df2f58d9fa982d82a621204026c9bfd7553ae) +Source-MD5: 4be834374a2254edc2203ecbf726af6d +Source-Checksum: SHA1(d7dc010aee17a4a71f86252f2631507dc108dc92) NoSetMAKEFLAGS: true NoSetLDFLAGS: true SetLIBRARY_PATH: %p/lib @@ -39,12 +39,30 @@ make fink-package-precedence --depfile-ext='\.d' --prohibit-bdep=netpbm,netpbm10,netpbm11 . +InfoTest: + TestScript: + #!/bin/sh -ev + # tests are manually run inside their directories. + export DYLD_LIBRARY_PATH=%b/package/lib + ### pamtosvg.test hangs, so don't test it. + for test_file in `find . -name *.test -print | grep -v examples | grep -v pamtosvg`; do + testdir=`dirname $test_file` + testname=`basename $test_file` + pushd $testdir + echo + echo Running test: $test_file + sh ./$testname || exit 2 + popd + done + + InstallScript: - make package pkgdir=`pwd`/package SYMLINK='ln -s' - install -d -m 755 %i/share %i/share/netpbm - printf package\n%i\n\n\n\n%i/share/netpbm\n\n\n | ./installnetpbm - rm -rf %i/share/man/web - mv %i/bin/doc.url %i/share/netpbm + # pkgdir = where 'make package' sends everything + make package pkgdir=`pwd`/package SYMLINK='ln -s' + install -d -m 755 %i/share %i/share/netpbm + printf package\n%i\n\n\n\n%i/share/netpbm\n\n\n | ./installnetpbm + rm -rf %i/share/man/web + mv %i/bin/doc.url %i/share/netpbm SplitOff: Package: %N-shlibs @@ -60,7 +78,7 @@ libiconv, libjasper.1-shlibs, libjbig-shlibs, -libjpeg8-shlibs, +libjpeg9-shlibs, libpng14-shlibs, libtiff5-shlibs, libxml2-shlibs @@ -91,8 +109,8 @@ Previously maintained by: Dave Morrison d...@finkproject.org Tarball generated with these commands: - svn checkout -r 1897 http://svn.code.sf.net/p/netpbm/code/stable/ netpbm-10.47.44 - tar cfj netpbm-10.47.44.tar.bz2 netpbm-10.47.44 + svn checkout -r 1960 http://svn.code.sf.net/p/netpbm/code/stable/ netpbm-10.47.45 + tar cfj netpbm-10.47.45.tar.bz2 netpbm-10.47.45 nieder: Change from 'super stable' to 'stable' trees. -- See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831iu=/4140/ostg.clktrk ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs
[cvs] dists/10.7/stable/main/finkinfo/games sdl.info,1.6,1.7
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/games In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17940 Modified Files: sdl.info Log Message: Attempt to fix XQuartz problems in SDL Index: sdl.info === RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/games/sdl.info,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- sdl.info22 Jul 2013 16:39:02 - 1.6 +++ sdl.info23 Jul 2013 14:47:08 - 1.7 @@ -19,7 +19,7 @@ Revision: 2 BuildDependsOnly: True Depends: %N-shlibs (= %v-%r) -BuildDepends: x11-dev, fink (= 0.24.12) +BuildDepends: pkgconfig, x11-dev, fink (= 0.24.12) Maintainer: Max Horn m...@quendi.de Source: http://www.libsdl.org/release/SDL-%v.tar.gz Source-MD5: 9d96df8417572a2afb781a7c4c811a85 @@ -27,8 +27,8 @@ PatchFile-MD5: 75d392042cf351161585fa4a674fe795 PatchScript: #!/bin/bash -ev -darwinvers=`sw_vers -productVersion | cut -d. -f1-2` -if [[ $darwinvers 10.7 ]]; then +x11vers=`%p/bin/pkg-config --modversion x11 | cut -d. -f1-2` +if [[ $x11vers 1.5 ]]; then %{default_script} fi -- See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831iu=/4140/ostg.clktrk ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs
[cvs] dists/10.7/stable/main/finkinfo/games sdl.info, 1.7, 1.8 sdl.patch, 1.4, 1.5
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/games In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29587 Modified Files: sdl.info sdl.patch Log Message: Yet another attempt to make SDL compile for everybody Index: sdl.patch === RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/games/sdl.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- sdl.patch 22 Jul 2013 12:19:11 - 1.4 +++ sdl.patch 23 Jul 2013 18:40:55 - 1.5 @@ -1,5 +1,108 @@ a/src/video/quartz/SDL_QuartzVideo.h.orig 2013-02-02 17:53:45.0 -0800 -+++ a/src/video/quartz/SDL_QuartzVideo.h 2013-02-02 17:54:15.0 -0800 +diff --git a/configure b/configure +index 4363500..82619e2 100755 +--- a/configure b/configure +@@ -24440,6 +24440,62 @@ fi + _ACEOF + + fi ++{ echo $as_me:$LINENO: checking for const parameter to _XData32 5 ++echo $ECHO_N checking for const parameter to _XData32... $ECHO_C 6; } ++have_const_param_xdata32=no ++cat conftest.$ac_ext _ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h conftest.$ac_ext ++cat conftest.$ac_ext _ACEOF ++/* end confdefs.h. */ ++ ++ #include X11/Xlibint.h ++ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len); ++ ++int ++main () ++{ ++ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try=$ac_compile ++case (($ac_try in ++ *\* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval echo \\$as_me:$LINENO: $ac_try_echo\) 5 ++ (eval $ac_compile) 2conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 conftest.err ++ rm -f conftest.er1 ++ cat conftest.err 5 ++ echo $as_me:$LINENO: \$? = $ac_status 5 ++ (exit $ac_status); } { ++ test -z $ac_c_werror_flag || ++ test ! -s conftest.err ++ } test -s conftest.$ac_objext; then ++ ++have_const_param_xdata32=yes ++cat confdefs.h \_ACEOF ++#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 1 ++_ACEOF ++ ++ ++else ++ echo $as_me: failed program was: 5 ++sed 's/^/| /' conftest.$ac_ext 5 ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo $as_me:$LINENO: result: $have_const_param_xdata32 5 ++echo ${ECHO_T}$have_const_param_xdata32 6; } + fi + fi + } +diff --git a/configure.in b/configure.in +index 08c8e1e..89c526d 100644 +--- a/configure.in b/configure.in +@@ -1127,6 +1127,17 @@ AC_HELP_STRING([--enable-video-x11-xrandr], [enable X11 Xrandr extension for ful + if test x$definitely_enable_video_x11_xrandr = xyes; then + AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR) + fi ++AC_MSG_CHECKING(for const parameter to _XData32) ++have_const_param_xdata32=no ++AC_TRY_COMPILE([ ++ #include X11/Xlibint.h ++ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len); ++],[ ++],[ ++have_const_param_xdata32=yes ++AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32) ++]) ++AC_MSG_RESULT($have_const_param_xdata32) + fi + fi + } +diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in +index 8bb1773..78ca747 100644 +--- a/include/SDL_config.h.in b/include/SDL_config.h.in +@@ -282,6 +282,7 @@ + #undef SDL_VIDEO_DRIVER_WINDIB + #undef SDL_VIDEO_DRIVER_WSCONS + #undef SDL_VIDEO_DRIVER_X11 ++#undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 + #undef SDL_VIDEO_DRIVER_X11_DGAMOUSE + #undef SDL_VIDEO_DRIVER_X11_DYNAMIC + #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT +diff --git a/src/video/quartz/SDL_QuartzVideo.h b/src/video/quartz/SDL_QuartzVideo.h +index 7506e0c..425896f 100644 +--- a/src/video/quartz/SDL_QuartzVideo.h b/src/video/quartz/SDL_QuartzVideo.h @@ -91,7 +91,9 @@ typedef struct SDL_PrivateVideoData { CGDirectDisplayID display;/* 0 == main display (only support single display) */ const void *mode; /* current mode of the display */ @@ -10,14 +113,19 @@ NSOpenGLContext*gl_context;/* OpenGL rendering context */ NSGraphicsContext *nsgfx_context; /* Cocoa graphics context */ Uint32 width, height, bpp; /* frequently used data about the display */ a/src/video/x11/SDL_x11sym.h.orig 2013-06-22 20:48:48.0 -0400 -+++ a/src/video/x11/SDL_x11sym.h 2013-06-22 20:51:18.0 -0400 -@@ -165,7 +165,7 @@ +diff --git a/src/video/x11/SDL_x11sym.h b/src/video/x11/SDL_x11sym.h +index 4875b98..bd83f7f 100644 +--- a/src/video/x11/SDL_x11sym.h b/src/video/x11/SDL_x11sym.h +@@ -165,7 +165,11 @@ SDL_X11_SYM(Bool,XShmQueryExtension,(Display* a),(a),return) */ #ifdef LONG64 SDL_X11_MODULE(IO_32BIT) --SDL_X11_SYM(int,_XData32,(Display
[cvs] dists/10.7/stable/main/finkinfo/languages llvm-gcc42.info, 1.12, 1.13
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/languages In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2548 Modified Files: llvm-gcc42.info Log Message: remove unnecessary xcrun --show-sdk-path Index: llvm-gcc42.info === RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/languages/llvm-gcc42.info,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- llvm-gcc42.info 23 Jul 2013 01:08:02 - 1.12 +++ llvm-gcc42.info 23 Jul 2013 20:29:55 - 1.13 @@ -28,7 +28,7 @@ InstallScript: #!/bin/bash -ev export LIBRARY_PATH=%p/lib:/usr/lib - export CPATH=%p/include:`xcrun --show-sdk-path`/usr/include + export CPATH=%p/include:/usr/include export PATH=%p/opt/texinfo-legacy/bin:%p/bin:/bin:/usr/bin:/sbin:/usr/sbin export LANGUAGES=c,c++,objc,obj-c++ export AR_FOR_TARGET=/usr/bin/ar -- See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831iu=/4140/ostg.clktrk ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs
[cvs] dists/10.7/stable/main/finkinfo/graphics bmp2png.info,1.2,1.3
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28901/graphics Modified Files: bmp2png.info Log Message: dep upgrade Index: bmp2png.info === RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/bmp2png.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- bmp2png.info17 Jan 2013 20:25:01 - 1.2 +++ bmp2png.info23 Jul 2013 07:22:10 - 1.3 @@ -1,11 +1,11 @@ Package: bmp2png Version: 1.62 -Revision: 2 +Revision: 3 Homepage: http://cetus.sakura.ne.jp/softlab/b2p-home/ Source: http://cetus.sakura.ne.jp/softlab/b2p-home/archives/%n-%v.tar.gz Source-MD5: 29562be8cb5300ecf0361904abff54dd -BuildDepends: libpng15, unzip -Depends: libpng15-shlibs +BuildDepends: libpng16, unzip +Depends: libpng16-shlibs Suggests: pngcrush, gif2png, tiff2png PatchFile: %n.patch PatchFile-MD5: 4b8267b69afc01f6c17158519582585d -- See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831iu=/4140/ostg.clktrk ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs
[cvs] dists/10.7/stable/main/finkinfo/net libcurl4.info,1.16,1.17
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/net In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11048/net Modified Files: libcurl4.info Log Message: Undo previous changes for futureos SDK support. Index: libcurl4.info === RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/net/libcurl4.info,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- libcurl4.info 19 Jul 2013 00:23:52 - 1.16 +++ libcurl4.info 23 Jul 2013 23:40:03 - 1.17 @@ -69,18 +69,8 @@ #curl tool needs to link to libcrypto when using libmetalink. perl -pi -e 's,\@LIBMETALINK_LIBS\@,\@LIBMETALINK_LIBS\@ -lcrypto,' src/Makefile.in #Set up to use system's ldap - darwin_vers=`uname -r | cut -d. -f1` - sdk_root='' - if [ $darwin_vers -ge 13 ]; then - darwinvers=`sw_vers -productVersion | cut -d. -f1-2` - if [ -d /Library/Developer/CommandLineTools ]; then - sdkroot=`xcode-select --print-path`/SDKs/MacOSX$darwinvers.sdk - else - sdkroot=`xcode-select --print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$darwinvers.sdk - fi - fi - /bin/cp $sdkroot/usr/include/lber*.h . - /bin/cp $sdkroot/usr/include/ldap*.h . + /bin/cp /usr/include/lber*.h . + /bin/cp /usr/include/ldap*.h . /bin/cp /usr/lib/libldap.dylib . -- See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831iu=/4140/ostg.clktrk ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs
[cvs] dists/10.7/stable/main/finkinfo/languages python27.info, 1.16, 1.17 python31.info, 1.9, 1.10 python32.info, 1.13, 1.14 python33.info, 1.10, 1.11
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/languages In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11048/languages Modified Files: python27.info python31.info python32.info python33.info Log Message: Undo previous changes for futureos SDK support. Index: python31.info === RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/languages/python31.info,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- python31.info 15 Jul 2013 22:20:07 - 1.9 +++ python31.info 23 Jul 2013 23:40:03 - 1.10 @@ -50,14 +50,6 @@ perl -pi -e 's/ -lSystemStubs//' ./configure perl -pi -e 's/-O3/-fwrapv -O3/' ./configure fi - if [ $darwin_vers -ge 13 ]; then - darwinvers=`sw_vers -productVersion | cut -d. -f1-2` - if [ -d /Library/Developer/CommandLineTools ]; then - export CFLAGS=-I`xcode-select --print-path`/SDKs/MacOSX$darwinvers.sdk/usr/include - else - export CFLAGS=-I`xcode-select --print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$darwinvers.sdk/usr/include - fi - fi if [ %m = x86_64 ]; then #perl -pi -e 's|num_missing != 2:|num_missing != 2:|g' ./setup.py # 10.7 and 10.8 have tcltk-8.5.x, 10.9 has 8.6.x Index: python33.info === RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/languages/python33.info,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- python33.info 15 Jul 2013 22:20:07 - 1.10 +++ python33.info 23 Jul 2013 23:40:03 - 1.11 @@ -58,14 +58,6 @@ perl -pi -e 's/ -lSystemStubs//' ./configure perl -pi -e 's/-O3/-fwrapv -O3/' ./configure fi - if [ $darwin_vers -ge 13 ]; then - darwinvers=`sw_vers -productVersion | cut -d. -f1-2` - if [ -d /Library/Developer/CommandLineTools ]; then - export CFLAGS=-I`xcode-select --print-path`/SDKs/MacOSX$darwinvers.sdk/usr/include - else - export CFLAGS=-I`xcode-select --print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$darwinvers.sdk/usr/include - fi - fi if [ %m = x86_64 ]; then #perl -pi.bak -e 's|num_missing != 2:|num_missing != 2:|g' ./setup.py # 10.7 and 10.8 have tcltk-8.5.x, 10.9 has 8.6.x Index: python32.info === RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/languages/python32.info,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- python32.info 15 Jul 2013 22:20:07 - 1.13 +++ python32.info 23 Jul 2013 23:40:03 - 1.14 @@ -55,14 +55,6 @@ perl -pi -e 's/ -lSystemStubs//' ./configure perl -pi -e 's/-O3/-fwrapv -O3/' ./configure fi - if [ $darwin_vers -ge 13 ]; then - darwinvers=`sw_vers -productVersion | cut -d. -f1-2` - if [ -d /Library/Developer/CommandLineTools ]; then - export CFLAGS=-I`xcode-select --print-path`/SDKs/MacOSX$darwinvers.sdk/usr/include - else - export CFLAGS=-I`xcode-select --print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$darwinvers.sdk/usr/include - fi - fi if [ %m = x86_64 ]; then #perl -pi.bak -e 's|num_missing != 2:|num_missing != 2:|g' ./setup.py # 10.7 and 10.8 have tcltk-8.5.x, 10.9 has 8.6.x Index: python27.info === RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/languages/python27.info,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- python27.info 15 Jul 2013 22:20:07 - 1.16 +++ python27.info 23 Jul 2013 23:40:03 - 1.17 @@ -58,14 +58,6 @@ perl -pi -e 's/ -lSystemStubs//' ./configure perl -pi -e 's/-O3/-fwrapv -O3/' ./configure fi - if [ $darwin_vers -ge 13 ]; then - darwinvers=`sw_vers -productVersion | cut -d. -f1-2` - if [ -d /Library/Developer/CommandLineTools ]; then - export CFLAGS=-I`xcode-select --print-path`/SDKs/MacOSX$darwinvers.sdk/usr/include - else - export CFLAGS=-I`xcode-select --print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$darwinvers.sdk/usr/include - fi - fi if [ %m = x86_64 ]; then perl -pi -e 's|num_missing != 5:|num_missing != 7:|g; s|have 5 missing|have 7 missing|' ./setup.py
[cvs] dists/10.7/stable/main/finkinfo/crypto htmldoc.patch,1.1,1.2
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/crypto In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11603 Modified Files: htmldoc.patch Log Message: unblock on 10.9 by switching to libjpeg9 and libpng16 Index: htmldoc.patch === RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/crypto/htmldoc.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- htmldoc.patch 25 Feb 2013 03:13:01 - 1.1 +++ htmldoc.patch 23 Jul 2013 23:54:58 - 1.2 @@ -1,6 +1,6 @@ -diff -Nurd -x'*~' htmldoc-1.8.27.orig/Makefile.in htmldoc-1.8.27/Makefile.in htmldoc-1.8.27.orig/Makefile.in2005-04-24 15:20:32.0 -0400 -+++ htmldoc-1.8.27/Makefile.in 2013-02-24 21:33:30.0 -0500 +diff -uNr htmldoc-1.8.27/Makefile.in htmldoc-1.8.27.fink/Makefile.in +--- htmldoc-1.8.27/Makefile.in 2005-04-24 15:20:32.0 -0400 htmldoc-1.8.27.fink/Makefile.in2013-07-21 09:30:34.0 -0400 @@ -62,7 +62,7 @@ clean: for dir in $(DIRS); do\ @@ -19,3 +19,180 @@ done +diff -uNr htmldoc-1.8.27/htmldoc/image.cxx htmldoc-1.8.27.fink/htmldoc/image.cxx +--- htmldoc-1.8.27/htmldoc/image.cxx 2006-05-31 15:00:02.0 -0400 htmldoc-1.8.27.fink/htmldoc/image.cxx 2013-07-21 09:30:34.0 -0400 +@@ -3,23 +3,11 @@ + * + * Image handling routines for HTMLDOC, a HTML document processing program. + * +- * Copyright 1997-2005 by Easy Software Products. ++ * Copyright 2011 by Michael R Sweet. ++ * Copyright 1997-2010 by Easy Software Products. All rights reserved. + * +- * These coded instructions, statements, and computer programs are the +- * property of Easy Software Products and are protected by Federal +- * copyright law. Distribution and use rights are outlined in the file +- * COPYING.txt which should have been included with this file. If this +- * file is missing or damaged please contact Easy Software Products +- * at: +- * +- * Attn: ESP Licensing Information +- * Easy Software Products +- * 44141 Airport View Drive, Suite 204 +- * Hollywood, Maryland 20636-3142 USA +- * +- * Voice: (301) 373-9600 +- * EMail: i...@easysw.com +- * WWW: http://www.easysw.com ++ * This program is free software. Distribution and use rights are outlined in ++ * the file COPYING.txt. + * + * Contents: + * +@@ -1392,9 +1380,9 @@ + cinfo.err = jerr; + jpeg_create_decompress(cinfo); + jpeg_stdio_src(cinfo, fp); +- jpeg_read_header(cinfo, 1); ++ jpeg_read_header(cinfo, TRUE); + +- cinfo.quantize_colors = 0; ++ cinfo.quantize_colors = FALSE; + + if (gray || cinfo.num_components == 1) + { +@@ -1499,7 +1487,7 @@ + + rows = NULL; + +- if (setjmp(pp-jmpbuf)) ++ if (setjmp(png_jmpbuf(pp))) + { + progress_error(HD_ERROR_BAD_FORMAT, PNG file contains errors!); + +@@ -1526,7 +1514,7 @@ + + png_read_info(pp, info); + +- if (info-color_type PNG_COLOR_MASK_PALETTE) ++ if (png_get_color_type(pp, info) PNG_COLOR_MASK_PALETTE) + { + png_set_expand(pp); + +@@ -1535,15 +1523,15 @@ + if (Encryption) + img-use ++; + } +- else if (info-bit_depth 8) ++ else if (png_get_bit_depth(pp, info) 8) + { + png_set_packing(pp); + png_set_expand(pp); + } +- else if (info-bit_depth == 16) ++ else if (png_get_bit_depth(pp, info) == 16) + png_set_strip_16(pp); + +- if (info-color_type PNG_COLOR_MASK_COLOR) ++ if (png_get_color_type(pp, info) PNG_COLOR_MASK_COLOR) + { + depth = 3; + img-depth = gray ? 1 : 3; +@@ -1554,10 +1542,10 @@ + img-depth = 1; + } + +- img-width = info-width; +- img-height = info-height; ++ img-width = png_get_image_width(pp, info); ++ img-height = png_get_image_height(pp, info); + +- if ((info-color_type PNG_COLOR_MASK_ALPHA) || info-num_trans) ++ if (png_get_color_type(pp, info) PNG_COLOR_MASK_ALPHA) + { + if ((PSLevel == 0 PDFVersion = 14) || PSLevel == 3) + image_need_mask(img, 8); +@@ -1571,14 +1559,14 @@ + + #ifdef DEBUG + printf(color_type=0x%04x, depth=%d, img-width=%d, img-height=%d, img-depth=%d\n, +- info-color_type, depth, img-width, img-height, img-depth); +- if (info-color_type PNG_COLOR_MASK_COLOR) ++ png_get_color_type(pp, info), depth, img-width, img-height, img-depth); ++ if (png_get_color_type(pp, info) PNG_COLOR_MASK_COLOR) + puts(COLOR); + else + puts(GRAYSCALE); +- if ((info-color_type PNG_COLOR_MASK_ALPHA) || info-num_trans) ++ if (png_get_color_type(pp, info) PNG_COLOR_MASK_ALPHA) + puts(ALPHA); +- if (info-color_type PNG_COLOR_MASK_PALETTE) ++ if (png_get_color_type(pp, info) PNG_COLOR_MASK_PALETTE) + puts(PALETTE); + #endif // DEBUG + +@@ -1594,9 +1582,9 @@ + * Allocate pointers... + */ + +- rows = (png_bytep *)calloc(info-height, sizeof(png_bytep)); ++ rows =
[cvs] dists/10.7/stable/main/finkinfo/crypto htmldoc.info,1.1,1.2
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/crypto In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11643 Modified Files: htmldoc.info Log Message: unblock on 10.9 by switching to libjpeg9 and libpng16 Index: htmldoc.info === RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/crypto/htmldoc.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- htmldoc.info25 Feb 2013 03:13:01 - 1.1 +++ htmldoc.info23 Jul 2013 23:55:14 - 1.2 @@ -4,7 +4,7 @@ Conflicts: htmldoc, htmldoc-nox Replaces: htmldoc, htmldoc-nox Version: 1.8.27 -Revision: 4 +Revision: 5 GCC: 4.0 Source: mirror:custom:%{ni}/%v/%{ni}-%v-source.tar.bz2 CustomMirror: @@ -16,21 +16,21 @@ Source-MD5: 35589e7b8fe9c54e11be87cd5aec4dcc Depends: (%type_raw[-nox] != -nox) fltk-x11-shlibs, - libjpeg8-shlibs, - libpng14-shlibs, + libjpeg9-shlibs, + libpng16-shlibs, openssl100-shlibs, (%type_raw[-nox] != -nox) x11 BuildDepends: (%type_raw[-nox] != -nox) fltk-x11, - libjpeg8, - libpng14, + libjpeg9, + libpng16, openssl100-dev, (%type_raw[-nox] != -nox) x11-dev PatchFile: %{ni}.patch -PatchFile-MD5: 37c4b525860480d76c929e50ff65b0f9 -ConfigureParams: --mandir=${prefix}/share/man --with-openssl-libs=%p/lib --with-openssl-includes=%p/include +PatchFile-MD5: 4b0fb6e5559297e9f2ceeb74d112e08c +ConfigureParams: --mandir=${prefix}/share/man --with-openssl-libs=%p/lib --with-openssl-includes=%p/include --disable-localjpeg --disable-localpng --disable-localzlib CompileScript: #!/bin/sh -ex if [ %type_pkg[-nox] = -nox ]; then -- See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831iu=/4140/ostg.clktrk ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs
[cvs] dists/10.7/stable/main/finkinfo/libs/perlmods extutils-makemaker-pm.info, 1.13, 1.14
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/perlmods In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11893 Modified Files: extutils-makemaker-pm.info Log Message: New upstream extutils-makemaker-pm 6.70. Index: extutils-makemaker-pm.info === RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/perlmods/extutils-makemaker-pm.info,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- extutils-makemaker-pm.info 21 Jul 2013 17:52:07 - 1.13 +++ extutils-makemaker-pm.info 24 Jul 2013 00:01:24 - 1.14 @@ -1,7 +1,7 @@ Info2: Package: extutils-makemaker-pm%type_pkg[perl] -Version: 6.68 -Revision: 3 +Version: 6.70 +Revision: 1 Type: perl (5.12.3 5.12.4) Description: Perl module to create a module Makefile @@ -28,7 +28,8 @@ # Dependencies: BuildDepends: fink (= 0.24.12) Depends: - cpan-meta-pm%type_pkg[perl] (= 2.112621-1), + cpan-meta-pm%type_pkg[perl] (= 2.131560-1), + cpan-meta-requirements-pm%type_pkg[perl] (= 2.121-1), cpan-meta-yaml-pm (= 0.008-1), extutils-command-pm (= 1.17-1), extutils-install-pm (= 1.54-1), @@ -39,8 +40,7 @@ parse-cpan-meta-pm (= 1.44.01), perl%type_pkg[perl]-core, scalar-list-utils-pm%type_pkg[perl], - version-pm%type_pkg[perl] (= 1:0.88-1), - version-requirements-pm%type_pkg[perl] (= 0.101020-1) + version-pm%type_pkg[perl] (= 1:0.88-1) Replaces: %{Ni}586-bin, %{Ni}588-bin @@ -48,7 +48,7 @@ # Unpack Phase: Source: mirror:cpan:modules/by-module/ExtUtils/ExtUtils-MakeMaker-%v.tar.gz -Source-MD5: a8afd7a2796d1dd64ef9d2b995e7eab6 +Source-MD5: a00814a9f09bd19387283f8feea11e67 PatchFile: %{ni}.patch PatchFile-MD5: 85f7c82e830f1d7b23e18ed32c078d3c -- See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831iu=/4140/ostg.clktrk ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs
[cvs] dists/10.4/stable/main/finkinfo/libs/perlmods extutils-makemaker-pm.info, 1.12, 1.13
Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/perlmods In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12137 Modified Files: extutils-makemaker-pm.info Log Message: New upstream extutils-makemaker-pm 6.70. Index: extutils-makemaker-pm.info === RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/perlmods/extutils-makemaker-pm.info,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- extutils-makemaker-pm.info 10 Jul 2013 23:05:48 - 1.12 +++ extutils-makemaker-pm.info 24 Jul 2013 00:02:00 - 1.13 @@ -1,7 +1,7 @@ Info2: Package: extutils-makemaker-pm%type_pkg[perl] -Version: 6.68 -Revision: 2 +Version: 6.70 +Revision: 1 Type: perl (5.8.8 5.10.0) Description: Perl module to create a module Makefile @@ -28,7 +28,8 @@ # Dependencies: BuildDepends: fink (= 0.24.12) Depends: - cpan-meta-pm%type_pkg[perl] (= 2.112621-1), + cpan-meta-pm%type_pkg[perl] (= 2.131560-1), + cpan-meta-requirements-pm%type_pkg[perl] (= 2.121-1), cpan-meta-yaml-pm (= 0.008-1), extutils-command-pm (= 1.17-1), extutils-install-pm (= 1.54-1), @@ -39,8 +40,7 @@ parse-cpan-meta-pm (= 1.44.01), perl%type_pkg[perl]-core, scalar-list-utils-pm%type_pkg[perl], - version-pm%type_pkg[perl] (= 1:0.88-1), - version-requirements-pm%type_pkg[perl] (= 0.101020-1) + version-pm%type_pkg[perl] (= 1:0.88-1) Replaces: %{Ni}586-bin, %{Ni}588-bin @@ -48,7 +48,7 @@ # Unpack Phase: Source: mirror:cpan:modules/by-module/ExtUtils/ExtUtils-MakeMaker-%v.tar.gz -Source-MD5: a8afd7a2796d1dd64ef9d2b995e7eab6 +Source-MD5: a00814a9f09bd19387283f8feea11e67 PatchFile: %{ni}.patch PatchFile-MD5: 85f7c82e830f1d7b23e18ed32c078d3c -- See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831iu=/4140/ostg.clktrk ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs
[cvs] experimental/fangism/finkinfo llvm33.info, 1.5, 1.6 llvm33.patch, 1.2, 1.3
Update of /cvsroot/fink/experimental/fangism/finkinfo In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14095 Modified Files: llvm33.info llvm33.patch Log Message: update patch to build on i386-darwin8 (asan_mac.cc) Index: llvm33.info === RCS file: /cvsroot/fink/experimental/fangism/finkinfo/llvm33.info,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- llvm33.info 28 Jun 2013 00:16:59 - 1.5 +++ llvm33.info 24 Jul 2013 00:55:16 - 1.6 @@ -46,7 +46,7 @@ UseMaxBuildJobs: true PatchFile: %n.patch -PatchFile-MD5: 719586edb9e0d0e7e8d4c691f7c89757 +PatchFile-MD5: 18c2dbdfb339e3781c52ac4ec181e2d0 PatchScript: #!/bin/sh -ev darwin_vers=`uname -r | cut -d. -f1` Index: llvm33.patch === RCS file: /cvsroot/fink/experimental/fangism/finkinfo/llvm33.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- llvm33.patch27 Jun 2013 22:30:16 - 1.2 +++ llvm33.patch24 Jul 2013 00:55:16 - 1.3 @@ -2319,39 +2319,71 @@ using namespace __asan; // NOLINT #define COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ptr, size) \ + diff --git a/projects/compiler-rt/lib/asan/asan_mac.cc b/projects/compiler-rt/lib/asan/asan_mac.cc -index 63fb5f6..a3c5659 100644 +index 9200837..903e0d5 100644 --- a/projects/compiler-rt/lib/asan/asan_mac.cc +++ b/projects/compiler-rt/lib/asan/asan_mac.cc -@@ -37,19 +37,30 @@ +@@ -36,23 +36,58 @@ + #include pthread.h + #include stdlib.h // for free() #include unistd.h ++#ifdef__APPLE__ #include libkern/OSAtomic.h - -+#if defined(__GNUC__) (__GNUC__ == 4) (__GNUC_MINOR__ 2) -+#define MISSING_BLOCKS_SUPPORT +#endif + ++#ifdef__APPLE__ ++#define __DARWIN_VERSION__ ((MAC_OS_X_VERSION_MIN_REQUIRED - MAC_OS_X_VERSION_10_0)/10 +4) ++#else ++#define __DARWIN_VERSION__ 0 ++#endif ++ ++// Looks like blocks/dispatch became available 10.6 and later. ++#if __DARWIN_VERSION__ (__DARWIN_VERSION__ 10) ++#define MISSING_BLOCKS_SUPPORT ++#endif + namespace __asan { ++// adjusting for different struct member names on darwin8 ++// see /usr/include/i386/_structs.h on darwin9+ ++// see /usr/include/i386/ucontext.h on darwin8 ++#if __DARWIN_VERSION__ (!__DARWIN_UNIX03 || (__DARWIN_VERSION__ 9)) ++#define STATE_MEM ss ++#else ++#define STATE_MEM __ss ++#endif ++ ++// see /usr/include/mach/i386/_structs.h on darwin9+ ++// see /usr/include/mach/i386/thread_status.h on darwin8 ++#if defined(__APPLE__) (!__DARWIN_UNIX03 || (__DARWIN_VERSION__ 9)) ++#define X86_THREAD_MEM(x) x ++#else ++#define X86_THREAD_MEM(x) __ ## x ++#endif ++ void GetPcSpBp(void *context, uptr *pc, uptr *sp, uptr *bp) { ucontext_t *ucontext = (ucontext_t*)context; +#if defined(__ppc__) || defined(__ppc64__) -+ *pc = ucontext-uc_mcontext-ss.srr0; -+ *bp = ucontext-uc_mcontext-ss.r1; // or r31 ++ *pc = ucontext-uc_mcontext-STATE_MEM.srr0; ++ *bp = ucontext-uc_mcontext-STATE_MEM.r1; // or r31 + // powerpc has no dedicated frame pointer -+ *sp = ucontext-uc_mcontext-ss.r1; ++ *sp = ucontext-uc_mcontext-STATE_MEM.r1; +#else # if SANITIZER_WORDSIZE == 64 - *pc = ucontext-uc_mcontext-__ss.__rip; - *bp = ucontext-uc_mcontext-__ss.__rbp; - *sp = ucontext-uc_mcontext-__ss.__rsp; +- *pc = ucontext-uc_mcontext-__ss.__rip; +- *bp = ucontext-uc_mcontext-__ss.__rbp; +- *sp = ucontext-uc_mcontext-__ss.__rsp; ++ *pc = ucontext-uc_mcontext-STATE_MEM.X86_THREAD_MEM(rip); ++ *bp = ucontext-uc_mcontext-STATE_MEM.X86_THREAD_MEM(rbp); ++ *sp = ucontext-uc_mcontext-STATE_MEM.X86_THREAD_MEM(rsp); # else - *pc = ucontext-uc_mcontext-__ss.__eip; - *bp = ucontext-uc_mcontext-__ss.__ebp; - *sp = ucontext-uc_mcontext-__ss.__esp; -+ *pc = ucontext-uc_mcontext-ss.eip; -+ *bp = ucontext-uc_mcontext-ss.ebp; -+ *sp = ucontext-uc_mcontext-ss.esp; ++ *pc = ucontext-uc_mcontext-STATE_MEM.X86_THREAD_MEM(eip); ++ *bp = ucontext-uc_mcontext-STATE_MEM.X86_THREAD_MEM(ebp); ++ *sp = ucontext-uc_mcontext-STATE_MEM.X86_THREAD_MEM(esp); # endif // SANITIZER_WORDSIZE +#endif } -- See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831iu=/4140/ostg.clktrk ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs
[cvs] dists/10.7/stable/main/finkinfo/utils parallel.info, 1.17, 1.18 parallel.patch, 1.1, 1.2
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/utils In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25603 Modified Files: parallel.info parallel.patch Log Message: GNU Parallel 20130722 ('Engelbart'). Index: parallel.info === RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/utils/parallel.info,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- parallel.info 23 Jun 2013 08:38:26 - 1.17 +++ parallel.info 24 Jul 2013 04:31:42 - 1.18 @@ -1,17 +1,20 @@ Package: parallel Description: Execute multiple jobs -Version: 20130622 +Version: 20130722 Revision: 1 Homepage: http://www.gnu.org/software/parallel/ Maintainer: Jesse Alama jesse.al...@gmail.com Source: mirror:gnu:%n/%n-%v.tar.bz2 -Source-MD5: a0740b771fe2dda162e1bb09b6996f57 +Source-MD5: ddb92b545af782b4d6288c65ef28847e PatchFile: %n.patch -PatchFile-MD5: 2ddec8c920069aa3de76dc0edd67bae0 -PatchScript: +PatchFile-MD5: bbae0e3f56e66b709fc08499150a1c55 +BuildDepends: + autoconf2.6 + CompileScript: #!/bin/sh -ev export SHELL=/bin/sh +autoreconf %{default_script} InstallScript: @@ -32,7 +35,7 @@ use as GNU Parallel is written to have the same options as xargs. If you write loops in shell, you will find GNU Parallel may be able to replace most of the loops and make them run faster by running several -jobs in parallel. GNU Parallel can even replace nested loops. +jobs in parallel. GNU Parallel makes sure output from the commands is the same output as you would get had you run the commands sequentially. This makes it Index: parallel.patch === RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/utils/parallel.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- parallel.patch 27 Apr 2013 08:16:37 - 1.1 +++ parallel.patch 24 Jul 2013 04:31:42 - 1.2 @@ -1,6 +1,6 @@ -diff -Naur '--exclude=*~' parallel-20130422/src/Makefile.am parallel-20130422.fink/src/Makefile.am parallel-20130422/src/Makefile.am 2012-03-21 22:01:19.0 +0100 -+++ parallel-20130422.fink/src/Makefile.am 2013-04-27 09:57:25.0 +0200 +diff -Naur parallel-20130722/src/Makefile.am parallel-20130722.fink/src/Makefile.am +--- parallel-20130722/src/Makefile.am 2012-03-21 22:01:19.0 +0100 parallel-20130722.fink/src/Makefile.am 2013-07-23 07:01:56.0 +0200 @@ -19,22 +19,22 @@ --section=1 $(srcdir)/niceload.pod $(srcdir)/niceload.1 -- See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831iu=/4140/ostg.clktrk ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs