diff --git a/accessibility/at-spi/files/patch-registryd_registry-main.c b/accessibility/at-spi/files/patch-registryd_registry-main.c index ac903d9f4e22..f54fa90b6b43 100644 --- a/accessibility/at-spi/files/patch-registryd_registry-main.c +++ b/accessibility/at-spi/files/patch-registryd_registry-main.c @@ -1,5 +1,5 @@ ---- registryd/registry-main.c.orig 2010-02-27 00:19:33.000000000 -0500 -+++ registryd/registry-main.c 2010-02-27 00:21:10.000000000 -0500 +--- registryd/registry-main.c.orig 2010-09-09 02:51:14 UTC ++++ registryd/registry-main.c @@ -198,6 +198,7 @@ main (int argc, char **argv) * has been set. If we have not been relocated, we will exit if the * at-spi-dbus key has been set. diff --git a/accessibility/dasher/files/patch-clang b/accessibility/dasher/files/patch-clang index 0f0ef1be5609..8b06f909d995 100644 --- a/accessibility/dasher/files/patch-clang +++ b/accessibility/dasher/files/patch-clang @@ -1,6 +1,6 @@ ---- ./Src/DasherCore/DasherViewSquare.h.orig 2013-05-24 17:03:27.185956866 +0200 -+++ ./Src/DasherCore/DasherViewSquare.h 2013-05-24 17:03:36.904410678 +0200 -@@ -20,11 +20,6 @@ +--- Src/DasherCore/DasherViewSquare.h.orig 2009-04-27 15:05:29 UTC ++++ Src/DasherCore/DasherViewSquare.h +@@ -20,11 +20,6 @@ namespace Dasher { class CDasherNode; } @@ -12,9 +12,9 @@ /// \ingroup View /// @{ ---- ./Src/DasherCore/SettingsStore.h.orig 2013-05-24 16:53:08.087996232 +0200 -+++ ./Src/DasherCore/SettingsStore.h 2013-05-24 16:53:40.137994206 +0200 -@@ -18,9 +18,6 @@ +--- Src/DasherCore/SettingsStore.h.orig 2009-04-27 15:05:30 UTC ++++ Src/DasherCore/SettingsStore.h +@@ -18,9 +18,6 @@ namespace Dasher { class CParameterNotificationEvent; } @@ -24,9 +24,9 @@ // Types that are parameters can be enum ParameterType { ---- ./Src/DasherCore/View/DelayedDraw.h.orig 2013-05-24 17:00:06.589967502 +0200 -+++ ./Src/DasherCore/View/DelayedDraw.h 2013-05-24 16:57:01.492979337 +0200 -@@ -15,8 +15,6 @@ +--- Src/DasherCore/View/DelayedDraw.h.orig 2009-04-27 15:05:30 UTC ++++ Src/DasherCore/View/DelayedDraw.h +@@ -15,8 +15,6 @@ namespace Dasher { class CDasherScreen; } diff --git a/accessibility/eflite/files/patch-Makefile.in b/accessibility/eflite/files/patch-Makefile.in index bc21e56e1198..e44ad0237e41 100644 --- a/accessibility/eflite/files/patch-Makefile.in +++ b/accessibility/eflite/files/patch-Makefile.in @@ -1,4 +1,4 @@ ---- Makefile.in.orig 2007-01-19 00:01:09.000000000 +0000 +--- Makefile.in.orig 2007-01-19 00:01:09 UTC +++ Makefile.in @@ -34,7 +34,7 @@ eflite: fs.o es.o soccon.o sockopen.o to $(CC) $(LDFLAGS) -o $@ $^ -lm $(LIBS) $(FLITE_LIBS) $(AUDIOLIBS) diff --git a/accessibility/gnome-mag/files/patch-docs_reference_Makefile.in b/accessibility/gnome-mag/files/patch-docs_reference_Makefile.in index 65bcf35805bc..421edc071b4f 100644 --- a/accessibility/gnome-mag/files/patch-docs_reference_Makefile.in +++ b/accessibility/gnome-mag/files/patch-docs_reference_Makefile.in @@ -1,6 +1,6 @@ ---- docs/reference/Makefile.in.orig 2009-08-09 02:49:17.000000000 +0200 -+++ docs/reference/Makefile.in 2009-08-09 02:54:54.000000000 +0200 -@@ -418,8 +418,6 @@ +--- docs/reference/Makefile.in.orig 2010-10-30 14:17:09 UTC ++++ docs/reference/Makefile.in +@@ -443,8 +443,6 @@ uninstall-am: uninstall-local html/index.html: -rm -rf html diff --git a/accessibility/gnome-speech/files/patch-configure b/accessibility/gnome-speech/files/patch-configure index 62b94639b55c..4a5934daa800 100644 --- a/accessibility/gnome-speech/files/patch-configure +++ b/accessibility/gnome-speech/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Tue Jun 7 02:40:27 2005 -+++ configure Tue Jun 7 02:41:02 2005 -@@ -20213,8 +20213,8 @@ +--- configure.orig 2009-02-15 17:43:46 UTC ++++ configure +@@ -21415,8 +21415,8 @@ fi fi if test "x$JAVAC" != "x" ; then @@ -11,11 +11,11 @@ JAVAC="$JAVAC -source 1.4" fi -@@ -20423,6 +20423,7 @@ +@@ -21634,6 +21634,7 @@ fi fi # Find the Java Access Bridge +JAB="no" - # Check whether --with-jab_dir or --without-jab_dir was given. + # Check whether --with-jab_dir was given. diff --git a/accessibility/speech-dispatcher/files/patch-src__clients__spdsend__server.c b/accessibility/speech-dispatcher/files/patch-src_clients_spdsend_server.c similarity index 50% rename from accessibility/speech-dispatcher/files/patch-src__clients__spdsend__server.c rename to accessibility/speech-dispatcher/files/patch-src_clients_spdsend_server.c index 85341558a6a4..f8f8dc8c1d62 100644 --- a/accessibility/speech-dispatcher/files/patch-src__clients__spdsend__server.c +++ b/accessibility/speech-dispatcher/files/patch-src_clients_spdsend_server.c @@ -1,5 +1,5 @@ ---- ./src/clients/spdsend/server.c.orig 2012-07-11 11:05:05.000000000 +0200 -+++ ./src/clients/spdsend/server.c 2013-11-15 08:44:05.105354858 +0100 +--- src/clients/spdsend/server.c.orig 2015-05-07 23:19:02 UTC ++++ src/clients/spdsend/server.c @@ -33,6 +33,7 @@ #include diff --git a/accessibility/speech-dispatcher/files/patch-src__server__speechd.h b/accessibility/speech-dispatcher/files/patch-src_server_speechd.h similarity index 100% rename from accessibility/speech-dispatcher/files/patch-src__server__speechd.h rename to accessibility/speech-dispatcher/files/patch-src_server_speechd.h diff --git a/accessibility/yasr/Makefile b/accessibility/yasr/Makefile index d6dbe18a4b3a..83da2d65681d 100644 --- a/accessibility/yasr/Makefile +++ b/accessibility/yasr/Makefile @@ -23,7 +23,6 @@ NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes -EXTRA_PATCHES= ${FILESDIR}/extra-patch-yasr__main.c PLIST_FILES= bin/yasr \ man/man1/yasr.1.gz \ diff --git a/accessibility/yasr/files/extra-patch-yasr__main.c b/accessibility/yasr/files/patch-yasr__main.c similarity index 65% rename from accessibility/yasr/files/extra-patch-yasr__main.c rename to accessibility/yasr/files/patch-yasr__main.c index 0e773cf87663..169881e78033 100644 --- a/accessibility/yasr/files/extra-patch-yasr__main.c +++ b/accessibility/yasr/files/patch-yasr__main.c @@ -1,5 +1,5 @@ ---- ./yasr/main.c.orig 2013-11-11 18:44:59.238198747 -0500 -+++ ./yasr/main.c 2013-11-11 18:45:09.927197900 -0500 +--- yasr/main.c.orig 2007-09-23 00:46:58 UTC ++++ yasr/main.c @@ -24,11 +24,7 @@ #include "yasr.h" diff --git a/arabic/libitl/files/patch-Makefile.in b/arabic/libitl/files/patch-Makefile.in index 4a9c37310bfa..511fc45c615a 100644 --- a/arabic/libitl/files/patch-Makefile.in +++ b/arabic/libitl/files/patch-Makefile.in @@ -1,5 +1,5 @@ ---- Makefile.in.orig 2013-09-25 23:27:38.000000000 +0800 -+++ Makefile.in 2013-09-25 23:28:25.000000000 +0800 +--- Makefile.in.orig 2009-03-17 16:26:28 UTC ++++ Makefile.in @@ -83,15 +83,15 @@ debinstall: components install: build/libitl.so build/libitl.a diff --git a/arabic/libitl/files/patch-hijri__Makefile b/arabic/libitl/files/patch-hijri_Makefile similarity index 78% rename from arabic/libitl/files/patch-hijri__Makefile rename to arabic/libitl/files/patch-hijri_Makefile index 60fba829a8af..4a41aa88c035 100644 --- a/arabic/libitl/files/patch-hijri__Makefile +++ b/arabic/libitl/files/patch-hijri_Makefile @@ -1,5 +1,5 @@ ---- hijri/Makefile.orig 2013-09-25 23:36:27.000000000 +0800 -+++ hijri/Makefile 2013-09-25 23:36:43.000000000 +0800 +--- hijri/Makefile.orig 2006-09-21 16:34:31 UTC ++++ hijri/Makefile @@ -10,10 +10,10 @@ demo_hijri: install: all diff --git a/arabic/libitl/files/patch-prayertime__Makefile b/arabic/libitl/files/patch-prayertime_Makefile similarity index 77% rename from arabic/libitl/files/patch-prayertime__Makefile rename to arabic/libitl/files/patch-prayertime_Makefile index d1bb99d170fe..632f656f50fb 100644 --- a/arabic/libitl/files/patch-prayertime__Makefile +++ b/arabic/libitl/files/patch-prayertime_Makefile @@ -1,5 +1,5 @@ ---- prayertime/Makefile.orig 2013-09-25 23:35:59.000000000 +0800 -+++ prayertime/Makefile 2013-09-25 23:36:20.000000000 +0800 +--- prayertime/Makefile.orig 2006-09-21 16:37:51 UTC ++++ prayertime/Makefile @@ -10,10 +10,10 @@ demo_prayer: install: all diff --git a/archivers/9e/files/patch-9e.c b/archivers/9e/files/patch-9e.c index 6333e3868512..2f7eefa8257c 100644 --- a/archivers/9e/files/patch-9e.c +++ b/archivers/9e/files/patch-9e.c @@ -1,6 +1,6 @@ ---- 9e.c.orig Thu Jun 15 13:40:52 2000 -+++ 9e.c Fri Jun 23 04:16:00 2000 -@@ -139,17 +139,16 @@ +--- 9e.c.orig 2000-06-15 13:40:52 UTC ++++ 9e.c +@@ -139,17 +139,16 @@ void do_file(char *file, FILE *fin) { } if(Hdrs) { diff --git a/archivers/advancecomp/files/patch-Portable.h b/archivers/advancecomp/files/patch-7z_Portable.h similarity index 64% rename from archivers/advancecomp/files/patch-Portable.h rename to archivers/advancecomp/files/patch-7z_Portable.h index e4ae77909198..e19b52f9c7de 100644 --- a/archivers/advancecomp/files/patch-Portable.h +++ b/archivers/advancecomp/files/patch-7z_Portable.h @@ -1,5 +1,5 @@ ---- 7z/Portable.h.org Mon Aug 7 10:54:35 2006 -+++ 7z/Portable.h Mon Aug 7 10:54:55 2006 +--- 7z/Portable.h.orig 2012-12-08 22:16:47 UTC ++++ 7z/Portable.h @@ -2,7 +2,7 @@ #define __PORTABLE_H diff --git a/archivers/arc/files/patch-Makefile b/archivers/arc/files/patch-Makefile index 39dc54bd7d4a..bc67c7a69791 100644 --- a/archivers/arc/files/patch-Makefile +++ b/archivers/arc/files/patch-Makefile @@ -1,7 +1,7 @@ ---- Makefile.orig Fri Oct 31 05:32:51 2003 -+++ Makefile Wed Nov 5 13:53:51 2003 -@@ -38,14 +38,14 @@ - OPT = -O +--- Makefile.orig 2010-08-07 13:06:42 UTC ++++ Makefile +@@ -44,14 +44,14 @@ SYSTEM = -DSYSV=1 + OPT = -O -Wall # For MWC 3.0 on the Atari ST, use: #CFLAGS = -VCOMPAC -VPEEP -CFLAGS = $(OPT) $(SYSTEM) diff --git a/archivers/arc/files/patch-arc.c b/archivers/arc/files/patch-arc.c index 63954d8d2317..446149131503 100644 --- a/archivers/arc/files/patch-arc.c +++ b/archivers/arc/files/patch-arc.c @@ -1,6 +1,6 @@ ---- arc.c.orig Sun Oct 9 03:38:22 2005 -+++ arc.c Fri Oct 14 14:22:38 2005 -@@ -290,7 +290,7 @@ +--- arc.c.orig 2010-08-07 13:06:42 UTC ++++ arc.c +@@ -298,7 +298,7 @@ main(num, arg) /* system entry point * keepbak = 1; else if (*a == 'W') /* suppress warnings */ @@ -9,7 +9,7 @@ #if !DOS else if (*a == 'I') /* image mode, no ASCII/EBCDIC x-late */ image = !image; -@@ -426,7 +426,7 @@ +@@ -434,7 +434,7 @@ static VOID expandlst(n) /* expand an indirect reference */ int n; /* number of entry to expand */ { diff --git a/archivers/arc/files/patch-arc.h b/archivers/arc/files/patch-arc.h index a228e9d11dfd..0ba371b9f874 100644 --- a/archivers/arc/files/patch-arc.h +++ b/archivers/arc/files/patch-arc.h @@ -1,6 +1,6 @@ ---- ./arc.h.orig Tue Aug 10 23:03:24 1999 -+++ ./arc.h Tue Aug 10 23:01:55 1999 -@@ -106,7 +106,7 @@ +--- arc.h.orig 2010-08-07 13:06:42 UTC ++++ arc.h +@@ -106,7 +106,7 @@ extern char tmpchr[2]; /* Temporary #if GEMDOS extern int hold; /* hold screen before exiting */ #endif diff --git a/archivers/arc/files/patch-arcadd.c b/archivers/arc/files/patch-arcadd.c index 8a5597cfc6f5..2c10334c08a0 100644 --- a/archivers/arc/files/patch-arcadd.c +++ b/archivers/arc/files/patch-arcadd.c @@ -1,6 +1,6 @@ ---- ./arcadd.c.orig Tue Aug 10 23:03:24 1999 -+++ ./arcadd.c Tue Aug 10 23:01:55 1999 -@@ -119,7 +119,7 @@ +--- arcadd.c.orig 2010-08-07 13:06:42 UTC ++++ arcadd.c +@@ -119,7 +119,7 @@ int fresh; /* true if fresh } #endif } @@ -9,7 +9,7 @@ printf("No files match: %s\n", arg[n]); } -@@ -133,7 +133,7 @@ +@@ -133,7 +133,7 @@ int fresh; /* true if fresh free(path); free(name); } @@ -18,7 +18,7 @@ printf("No files were added.\n"); } -@@ -227,7 +227,7 @@ +@@ -227,7 +227,7 @@ addbunch(nfiles, path, name, move, updat if (move) { /* if this was a move */ for (n = 0; n < nfiles; n++) { /* then delete each file * added */ @@ -27,7 +27,7 @@ printf("Cannot unsave %s\n", path[n]); nerrs++; } -@@ -259,7 +259,7 @@ +@@ -259,7 +259,7 @@ addfile(path, name, update, fresh) /* ad if (!f) #endif { @@ -36,7 +36,7 @@ printf("Cannot read file: %s\n", path); nerrs++; } -@@ -267,7 +267,7 @@ +@@ -267,7 +267,7 @@ addfile(path, name, update, fresh) /* ad } #if !DOS if (strlen(name) >= FNLEN) { diff --git a/archivers/arc/files/patch-arccvt.c b/archivers/arc/files/patch-arccvt.c index 1f496113cbb2..54fe714c5b57 100644 --- a/archivers/arc/files/patch-arccvt.c +++ b/archivers/arc/files/patch-arccvt.c @@ -1,6 +1,6 @@ ---- ./arccvt.c.orig Tue Aug 10 23:03:24 1999 -+++ ./arccvt.c Tue Aug 10 23:01:55 1999 -@@ -120,7 +120,7 @@ +--- arccvt.c.orig 2010-08-07 13:06:42 UTC ++++ arccvt.c +@@ -120,7 +120,7 @@ cvtfile(hdr) /* convert a file */ writehdr(hdr, new); /* write out real header */ fseek(new, hdr->size, 1); /* skip over data to next header */ fclose(tmp); /* all done with the file */ diff --git a/archivers/arc/files/patch-arcdata.c b/archivers/arc/files/patch-arcdata.c index f9e7a9067de8..386eb235c141 100644 --- a/archivers/arc/files/patch-arcdata.c +++ b/archivers/arc/files/patch-arcdata.c @@ -1,6 +1,6 @@ ---- ./arcdata.c.orig Tue Aug 10 23:03:24 1999 -+++ ./arcdata.c Tue Aug 10 23:01:56 1999 -@@ -35,7 +35,7 @@ +--- arcdata.c.orig 2010-08-07 13:06:42 UTC ++++ arcdata.c +@@ -35,7 +35,7 @@ char tmpchr[2] = "-";/* Tempo #if GEMDOS int hold = 0; /* true to pause before exit */ #endif diff --git a/archivers/arc/files/patch-arcdos.c b/archivers/arc/files/patch-arcdos.c index 52bf11b472f3..28cec121b0f3 100644 --- a/archivers/arc/files/patch-arcdos.c +++ b/archivers/arc/files/patch-arcdos.c @@ -1,25 +1,23 @@ -*** arcdos.c.old Wed Apr 15 02:58:21 1992 ---- arcdos.c Sat Dec 31 20:32:25 1994 -*************** -*** 173,186 **** ---- 173,192 ---- - struct tm tm; - struct timeval tvp[2]; - int utimes(); -+ #if !defined(__FreeBSD__) && !defined(__OpenBSD__) - long tmclock(); -+ #endif - tm.tm_sec = (time & 31) * 2; - tm.tm_min = (time >> 5) & 63; - tm.tm_hour = (time >> 11); - tm.tm_mday = date & 31; - tm.tm_mon = ((date >> 5) & 15) - 1; - tm.tm_year = (date >> 9) + 80; -+ #if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) - tvp[0].tv_sec = tmclock(&tm); -+ #else -+ tvp[0].tv_sec = timelocal(&tm); -+ #endif - tvp[1].tv_sec = tvp[0].tv_sec; - tvp[0].tv_usec = tvp[1].tv_usec = 0; - utimes(f, tvp); +--- arcdos.c.orig 2010-08-07 13:06:42 UTC ++++ arcdos.c +@@ -175,14 +175,20 @@ setstamp(f, date, time) /* set a file's + struct tm tm; + struct timeval tvp[2]; + int utimes(); ++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) + long tmclock(); ++#endif + tm.tm_sec = (time & 31) * 2; + tm.tm_min = (time >> 5) & 63; + tm.tm_hour = (time >> 11); + tm.tm_mday = date & 31; + tm.tm_mon = ((date >> 5) & 15) - 1; + tm.tm_year = (date >> 9) + 80; ++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) + tvp[0].tv_sec = tmclock(&tm); ++#else ++ tvp[0].tv_sec = timelocal(&tm); ++#endif + tvp[1].tv_sec = tvp[0].tv_sec; + tvp[0].tv_usec = tvp[1].tv_usec = 0; + utimes(f, tvp); diff --git a/archivers/arc/files/patch-arcext.c b/archivers/arc/files/patch-arcext.c index eae8495ed002..7e8f1434ea04 100644 --- a/archivers/arc/files/patch-arcext.c +++ b/archivers/arc/files/patch-arcext.c @@ -1,6 +1,6 @@ ---- arcext.c.orig Sat Oct 8 22:24:37 2005 -+++ arcext.c Fri Oct 14 00:52:14 2005 -@@ -143,7 +143,7 @@ +--- arcext.c.orig 2010-08-07 13:06:42 UTC ++++ arcext.c +@@ -143,7 +143,7 @@ extfile(hdr, path, prt) /* extract a fi if (note) printf("Extracting file: %s\n", fix); @@ -9,7 +9,7 @@ if ((f = fopen(fix, "r"))) { /* see if it exists */ fclose(f); printf("WARNING: File %s already exists!", fix); -@@ -190,7 +190,7 @@ +@@ -191,7 +191,7 @@ extfile(hdr, path, prt) /* extract a fi if (!f) #endif { diff --git a/archivers/arc/files/patch-arcio.c b/archivers/arc/files/patch-arcio.c index 7034aeaf6cb0..be27ece679a4 100644 --- a/archivers/arc/files/patch-arcio.c +++ b/archivers/arc/files/patch-arcio.c @@ -1,6 +1,6 @@ ---- arcio.c.orig Wed Apr 15 02:58:26 1992 -+++ arcio.c Sat Aug 11 22:10:55 2001 -@@ -46,7 +46,7 @@ +--- arcio.c.orig 2010-08-07 13:06:42 UTC ++++ arcio.c +@@ -46,7 +46,7 @@ readhdr(hdr, f) /* read a header from return 0; /* then signal end of archive */ if (hdrver != ARCMARK) { /* check archive validity */ @@ -9,7 +9,7 @@ printf("An entry in %s has a bad header.\n", arcname); nerrs++; } -@@ -63,10 +63,10 @@ +@@ -67,10 +67,10 @@ readhdr(hdr, f) /* read a header from if (feof(f) && first) arcdie("%s is not an archive", arcname); @@ -22,7 +22,7 @@ printf(" %d bytes skipped.\n", try); if (feof(f)) -@@ -110,7 +110,8 @@ +@@ -118,7 +118,8 @@ readhdr(hdr, f) /* read a header from hdr->crc = (short) ((dummy[22] << 8) + dummy[21]); for (i = 0, hdr->length=0; i<4; hdr->length<<=8, hdr->length += dummy[26-i], i++); #endif diff --git a/archivers/arc/files/patch-arclzw.c b/archivers/arc/files/patch-arclzw.c index 7933c26409d1..c0f1c8996403 100644 --- a/archivers/arc/files/patch-arclzw.c +++ b/archivers/arc/files/patch-arclzw.c @@ -1,6 +1,6 @@ ---- ./arclzw.c.orig Tue Aug 10 23:03:25 1999 -+++ ./arclzw.c Tue Aug 10 23:01:57 1999 -@@ -546,7 +546,7 @@ +--- arclzw.c.orig 2010-08-07 13:06:42 UTC ++++ arclzw.c +@@ -560,7 +560,7 @@ decomp(squash, f, t) /* decompress a fi */ if (code >= free_ent) { if (code > free_ent) { diff --git a/archivers/arc/files/patch-arcrun.c b/archivers/arc/files/patch-arcrun.c index 207e33531b82..42b1985b4bd8 100644 --- a/archivers/arc/files/patch-arcrun.c +++ b/archivers/arc/files/patch-arcrun.c @@ -1,6 +1,6 @@ ---- arcrun.c.orig Wed Oct 12 19:22:18 2005 -+++ arcrun.c Sat May 27 03:47:30 2006 -@@ -98,7 +98,7 @@ +--- arcrun.c.orig 2010-08-07 13:06:42 UTC ++++ arcrun.c +@@ -98,7 +98,7 @@ runfile(hdr, num, arg) /* run a file */ strcpy(sys, buf); else { @@ -9,7 +9,7 @@ printf("File %s is not a .BAS, .BAT, .COM, or .EXE\n", hdr->name); nerrs++; -@@ -112,7 +112,7 @@ +@@ -112,7 +112,7 @@ runfile(hdr, num, arg) /* run a file */ && strcmp(i, ".TTP") && strcmp(i, ".TOS")) { @@ -18,7 +18,7 @@ printf("File %s is not a .PRG, .TOS, or .TTP\n", hdr->name); nerrs++; -@@ -122,7 +122,7 @@ +@@ -122,7 +122,7 @@ runfile(hdr, num, arg) /* run a file */ } #endif @@ -27,7 +27,7 @@ if ((tmp = fopen(buf, "r"))) arcdie("Temporary file %s already exists", buf); if (!(tmp = tmpopen(buf))) -@@ -146,7 +146,7 @@ +@@ -146,7 +146,7 @@ runfile(hdr, num, arg) /* run a file */ if (system(buf)) /* try to invoke it */ arcdie("Execution failed for %s", buf); #endif diff --git a/archivers/arc/files/patch-arcunp.c b/archivers/arc/files/patch-arcunp.c index 08e091f2462e..ed3f7191d744 100644 --- a/archivers/arc/files/patch-arcunp.c +++ b/archivers/arc/files/patch-arcunp.c @@ -1,6 +1,6 @@ ---- ./arcunp.c.orig Tue Aug 10 23:03:25 1999 -+++ ./arcunp.c Tue Aug 10 23:01:57 1999 -@@ -123,7 +123,7 @@ +--- arcunp.c.orig 2010-08-07 13:06:42 UTC ++++ arcunp.c +@@ -122,7 +122,7 @@ unpack(f, t, hdr) /* unpack an archive break; default: /* unknown method */ @@ -9,7 +9,7 @@ printf("I don't know how to unpack file %s\n", hdr->name); printf("I think you need a newer version of ARC\n"); nerrs++; -@@ -135,7 +135,7 @@ +@@ -134,7 +134,7 @@ unpack(f, t, hdr) /* unpack an archive /* cleanups common to all methods */ if (crcval != hdr->crc) { diff --git a/archivers/arj/files/patch-arj_arcv.c b/archivers/arj/files/patch-arj__arcv.c similarity index 85% rename from archivers/arj/files/patch-arj_arcv.c rename to archivers/arj/files/patch-arj__arcv.c index e65faa41f9cc..2bfbab86c1e0 100644 --- a/archivers/arj/files/patch-arj_arcv.c +++ b/archivers/arj/files/patch-arj__arcv.c @@ -1,6 +1,6 @@ ---- arj_arcv.c 2005-06-21 22:53:12.000000000 +0300 -+++ arj_arcv.c 2005-11-24 02:50:31.000000000 +0200 -@@ -59,27 +59,27 @@ +--- arj_arcv.c.orig 2005-06-21 19:53:12 UTC ++++ arj_arcv.c +@@ -59,27 +59,27 @@ static char idxid_fault[]="?"; #define setup_hput(ptr) (tmp_hptr=(ptr)) #define hget_byte() (*(tmp_hptr++)&0xFF) @@ -35,7 +35,7 @@ return result; } -@@ -87,18 +87,18 @@ +@@ -87,18 +87,18 @@ static unsigned long hget_longword() /* Writes two bytes to the header, incrementing the pointer */ @@ -58,4 +58,3 @@ } /* Calculates and stores the basic header size */ -diff -Naur -x .svn -x CVS arj-3.10.22.orig/arj_proc.c arj-3.10.22/arj_proc.c diff --git a/archivers/arj/files/patch-arj_proc.c b/archivers/arj/files/patch-arj__proc.c similarity index 79% rename from archivers/arj/files/patch-arj_proc.c rename to archivers/arj/files/patch-arj__proc.c index c8a27fcf44cc..b6b733254d00 100644 --- a/archivers/arj/files/patch-arj_proc.c +++ b/archivers/arj/files/patch-arj__proc.c @@ -1,6 +1,6 @@ ---- arj_proc.c 2005-11-24 02:50:19.000000000 +0200 -+++ arj_proc.c 2005-11-24 02:50:31.000000000 +0200 -@@ -585,7 +585,7 @@ +--- arj_proc.c.orig 2005-06-21 19:53:12 UTC ++++ arj_proc.c +@@ -585,7 +585,7 @@ int search_for_extension(char *name, cha /* Returns the exact amount of data that could be safely written to the destination volume */ @@ -9,7 +9,7 @@ { unsigned long pvol; unsigned int arjsec_overhead; -@@ -605,7 +605,7 @@ +@@ -605,7 +605,7 @@ unsigned long get_volfree(unsigned int i remain=volume_limit-ftell(aostream)-pvol-(long)arjsec_overhead- (long)out_bytes-(long)cpos-(long)ext_voldata- MULTIVOLUME_RESERVE-t_volume_offset; @@ -18,7 +18,7 @@ } /* Performs various checks when multivolume data is packed to predict an -@@ -2466,14 +2466,14 @@ +@@ -2466,14 +2466,14 @@ static int get_str_from_jq() *tsptr='\0'; endptr=tsptr; tsptr=sptr; @@ -36,8 +36,8 @@ tsptr++; } } -@@ -2901,9 +2901,9 @@ - #if (defined(WORDS_BIGENDIAN) || defined(ALIGN_POINTERS)) && !defined(ARJDISP) && !defined(REGISTER) +@@ -2901,9 +2901,9 @@ char *ltrim(char *str) + #if defined(WORDS_BIGENDIAN)&&!defined(ARJDISP)&&!defined(REGISTER) /* Model-independent routine to get 2 bytes from far RAM */ -unsigned int mget_word(char FAR *p) @@ -48,7 +48,7 @@ b0=mget_byte(p); b1=mget_byte(p+1); -@@ -2912,9 +2912,9 @@ +@@ -2912,9 +2912,9 @@ unsigned int mget_word(char FAR *p) /* Model-independent routine to get 4 bytes from far RAM */ @@ -60,7 +60,7 @@ w0=mget_word(p); w1=mget_word(p+2); -@@ -2923,7 +2923,7 @@ +@@ -2923,7 +2923,7 @@ unsigned long mget_dword(char FAR *p) /* Model-independent routine to store 2 bytes in far RAM */ @@ -69,7 +69,7 @@ { mput_byte(w&0xFF, p); mput_byte(w>>8 , p+1); -@@ -2931,7 +2931,7 @@ +@@ -2931,7 +2931,7 @@ void mput_word(unsigned int w, char FAR /* Model-independent routine to store 4 bytes in far RAM */ diff --git a/archivers/arj/files/patch-arj_proc.h b/archivers/arj/files/patch-arj__proc.h similarity index 89% rename from archivers/arj/files/patch-arj_proc.h rename to archivers/arj/files/patch-arj__proc.h index 9501e70c08af..11dda85fa14d 100644 --- a/archivers/arj/files/patch-arj_proc.h +++ b/archivers/arj/files/patch-arj__proc.h @@ -1,5 +1,5 @@ ---- arj_proc.h.orig 2004-01-25 08:39:30.000000000 -0200 -+++ arj_proc.h 2010-02-19 08:35:05.000000000 -0200 +--- arj_proc.h.orig 2004-01-25 10:39:30 UTC ++++ arj_proc.h @@ -8,15 +8,17 @@ #ifndef ARJ_PROC_INCLUDED #define ARJ_PROC_INCLUDED @@ -24,7 +24,7 @@ #endif /* Prototypes */ -@@ -31,7 +33,7 @@ +@@ -31,7 +33,7 @@ void copy_bytes(unsigned long nbytes); int translate_path(char *name); void restart_proc(char *dest); int search_for_extension(char *name, char *ext_list); @@ -33,7 +33,7 @@ unsigned int check_multivolume(unsigned int increment); void store(); void hollow_encode(); -@@ -61,10 +63,10 @@ +@@ -61,10 +63,10 @@ void unpack_mem(struct mempack *mempack) void strip_lf(char *str); char *ltrim(char *str); #ifdef WORDS_BIGENDIAN diff --git a/archivers/arj/files/patch-environ.c b/archivers/arj/files/patch-environ.c index f4cbb1d89387..d1bedb05e458 100644 --- a/archivers/arj/files/patch-environ.c +++ b/archivers/arj/files/patch-environ.c @@ -1,6 +1,6 @@ ---- environ.c.orig 2010-10-28 13:11:54.000000000 -0200 -+++ environ.c 2010-10-28 13:13:10.000000000 -0200 -@@ -2058,7 +2058,7 @@ +--- environ.c.orig 2004-06-18 16:19:36 UTC ++++ environ.c +@@ -2058,7 +2058,7 @@ FILE *file_open(char *name, char *mode) /* ASR fix 01/10/2003 -- re-fix to handle umask 022 correctly */ if((handle=open(name, oflag, 0644))==-1) return(NULL); diff --git a/archivers/arj/files/patch-fardata.c b/archivers/arj/files/patch-fardata.c index 0b9163f954f2..1ce033fd6123 100644 --- a/archivers/arj/files/patch-fardata.c +++ b/archivers/arj/files/patch-fardata.c @@ -1,5 +1,5 @@ ---- fardata.c.orig 2010-01-18 10:06:57.000000000 -0200 -+++ fardata.c 2010-01-18 10:08:24.000000000 -0200 +--- fardata.c.orig 2004-04-17 11:39:42 UTC ++++ fardata.c @@ -190,7 +190,7 @@ int msg_sprintf(char *str, FMSG *fmt, .. /* Length-limited strlen() */ diff --git a/archivers/ark/files/patch-git_cd8ad27 b/archivers/ark/files/patch-git_cd8ad27 index 229d8cd202c4..058d208c0c68 100644 --- a/archivers/ark/files/patch-git_cd8ad27 +++ b/archivers/ark/files/patch-git_cd8ad27 @@ -31,7 +31,7 @@ Date: Mon Nov 24 01:37:06 2014 +0200 Conflicts: part/part.cpp ---- app/mainwindow.cpp +--- app/mainwindow.cpp.orig 2014-10-25 12:53:24 UTC +++ app/mainwindow.cpp @@ -38,6 +38,7 @@ #include @@ -50,7 +50,7 @@ Date: Mon Nov 24 01:37:06 2014 +0200 delete m_part; m_part = 0; } ---- part/part.cpp +--- part/part.cpp.orig 2014-10-25 12:53:24 UTC +++ part/part.cpp @@ -53,7 +53,6 @@ #include @@ -60,7 +60,7 @@ Date: Mon Nov 24 01:37:06 2014 +0200 #include #include -@@ -138,8 +137,6 @@ Part::Part(QWidget *parentWidget, QObject *parent, const QVariantList& args) +@@ -138,8 +137,6 @@ Part::Part(QWidget *parentWidget, QObjec Part::~Part() { diff --git a/archivers/atool/files/patch-configure b/archivers/atool/files/patch-configure index 3460043639a9..c065424bc1c9 100644 --- a/archivers/atool/files/patch-configure +++ b/archivers/atool/files/patch-configure @@ -1,6 +1,6 @@ --- configure.orig 2012-02-21 18:14:06 UTC +++ configure -@@ -2261,7 +2261,7 @@ +@@ -2261,7 +2261,7 @@ fi eval `$PERL -V:startperl` diff --git a/archivers/bzip/files/patch-Makefile b/archivers/bzip/files/patch-Makefile index 69b52ae7048c..071211dc6cd0 100644 --- a/archivers/bzip/files/patch-Makefile +++ b/archivers/bzip/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Sat Aug 31 09:50:33 1996 -+++ Makefile Fri Sep 27 13:57:55 1996 +--- Makefile.orig 1996-08-31 07:50:33 UTC ++++ Makefile @@ -1,29 +1,17 @@ - -CC = gcc diff --git a/archivers/bzip/files/patch-bzip.c b/archivers/bzip/files/patch-bzip.c index ea9513a90511..cba7ce00e711 100644 --- a/archivers/bzip/files/patch-bzip.c +++ b/archivers/bzip/files/patch-bzip.c @@ -1,4 +1,4 @@ ---- bzip.c.orig 1996-08-30 20:35:28.000000000 +0000 +--- bzip.c.orig 1996-08-30 20:35:28 UTC +++ bzip.c @@ -114,9 +114,13 @@ --*/ diff --git a/archivers/bzip2/Makefile b/archivers/bzip2/Makefile index efec0cf588fd..60c6eb2645ac 100644 --- a/archivers/bzip2/Makefile +++ b/archivers/bzip2/Makefile @@ -13,7 +13,6 @@ COMMENT= Block-sorting file compressor USES= cpe CPE_VENDOR= bzip USE_LDCONFIG= yes -PATCH_STRIP= -p3 OPTIONS_DEFINE= DOCS diff --git a/archivers/bzip2/files/patch-Makefile b/archivers/bzip2/files/patch-Makefile index 3cb244c9242e..59d34dd2a38c 100644 --- a/archivers/bzip2/files/patch-Makefile +++ b/archivers/bzip2/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Tue Jan 2 22:49:21 2007 -+++ Makefile Sat Jan 27 12:02:14 2007 +--- Makefile.orig 2010-09-10 22:46:02 UTC ++++ Makefile @@ -15,13 +15,15 @@ SHELL=/bin/sh @@ -18,7 +18,7 @@ # Where you want it installed when you do 'make install' PREFIX=/usr/local -@@ -35,10 +37,18 @@ +@@ -35,10 +37,18 @@ OBJS= blocksort.o \ decompress.o \ bzlib.o @@ -40,7 +40,7 @@ bzip2recover: bzip2recover.o $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o -@@ -52,6 +62,10 @@ +@@ -52,6 +62,10 @@ libbz2.a: $(OBJS) $(RANLIB) libbz2.a ; \ fi @@ -51,7 +51,7 @@ check: test test: bzip2 @cat words1 -@@ -109,9 +123,25 @@ +@@ -109,10 +123,26 @@ install: bzip2 bzip2recover echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1 clean: @@ -59,7 +59,7 @@ + rm -f *.o *.so libbz2.a libbz2.so.1 bzip2 bzip2recover \ sample1.rb2 sample2.rb2 sample3.rb2 \ sample1.tst sample2.tst sample3.tst -+ + +blocksort.so: blocksort.c + @cat words0 + $(CC) $(CFLAGS) $(SOFLAGS) -c blocksort.c -o blocksort.so @@ -75,6 +75,7 @@ + $(CC) $(CFLAGS) $(SOFLAGS) -c decompress.c -o decompress.so +bzlib.so: bzlib.c + $(CC) $(CFLAGS) $(SOFLAGS) -c bzlib.c -o bzlib.so - ++ blocksort.o: blocksort.c @cat words0 + $(CC) $(CFLAGS) -c blocksort.c diff --git a/archivers/dact/files/patch-Makefile.in b/archivers/dact/files/patch-Makefile.in index 8ff5925b635b..34b4e903adbd 100644 --- a/archivers/dact/files/patch-Makefile.in +++ b/archivers/dact/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2006-03-25 16:15:04.000000000 +0300 -+++ Makefile.in 2015-02-25 22:26:51.000000000 +0300 -@@ -24,8 +24,8 @@ +--- Makefile.in.orig 2006-03-25 13:15:04 UTC ++++ Makefile.in +@@ -24,8 +24,8 @@ INSTALL = @INSTALL@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -11,7 +11,7 @@ sysconfdir = @sysconfdir@ mandir = @mandir@ datadir = @datadir@ -@@ -41,13 +41,14 @@ +@@ -41,13 +41,14 @@ OBJS += dact_common.o comp_fail.o comp_p # be kept in sync with OBJS SHLIBOBJS += dact_common_shr.o comp_fail_shr.o comp_plain_shr.o buffer_shr.o header_shr.o sort_shr.o module_shr.o parse_shr.o dendian_shr.o crc_shr.o net_shr.o ui_shr.o sfx_shr.o libdact_shr.o @SHLIBOBJS@ ALGO = comp_snibble.c comp_delta.c comp_text.c comp_rle.c cipher_chaos.c cipher_sub.c cipher_psub.c @ALGO@ diff --git a/archivers/deutex/files/patch-src-deutex.h b/archivers/deutex/files/patch-src_deutex.h similarity index 86% rename from archivers/deutex/files/patch-src-deutex.h rename to archivers/deutex/files/patch-src_deutex.h index 20e713558adb..e410fcd1e6ed 100644 --- a/archivers/deutex/files/patch-src-deutex.h +++ b/archivers/deutex/files/patch-src_deutex.h @@ -1,6 +1,6 @@ ---- src/deutex.h.orig 1999-12-31 07:20:22.000000000 +0800 -+++ src/deutex.h 2012-02-12 16:53:51.000000000 +0800 -@@ -31,23 +31,13 @@ +--- src/deutex.h.orig 1999-12-30 23:20:22 UTC ++++ src/deutex.h +@@ -31,23 +31,13 @@ Place, Suite 330, Boston, MA 02111-1307, #define DeuSF for DOS .EXE Unix Linux OS/2 *********************************************/ diff --git a/archivers/dpkg/files/patch-lib_compat_gettext.h b/archivers/dpkg/files/patch-lib_compat_gettext.h index 9598958acaee..807480c33a2c 100644 --- a/archivers/dpkg/files/patch-lib_compat_gettext.h +++ b/archivers/dpkg/files/patch-lib_compat_gettext.h @@ -1,4 +1,4 @@ ---- lib/compat/gettext.h.orig 2015-05-03 14:52:33 UTC +--- lib/compat/gettext.h.orig 2015-11-25 21:45:14 UTC +++ lib/compat/gettext.h @@ -53,7 +53,6 @@ , which chokes if dcgettext is defined as a macro. So include diff --git a/archivers/dpkg/files/patch-scripts_Dpkg_Compression.pm b/archivers/dpkg/files/patch-scripts_Dpkg_Compression.pm index ad8ce0893d9f..cad07bc2b42c 100644 --- a/archivers/dpkg/files/patch-scripts_Dpkg_Compression.pm +++ b/archivers/dpkg/files/patch-scripts_Dpkg_Compression.pm @@ -1,4 +1,4 @@ ---- scripts/Dpkg/Compression.pm.orig 2015-06-11 20:28:56 UTC +--- scripts/Dpkg/Compression.pm.orig 2016-07-03 19:02:23 UTC +++ scripts/Dpkg/Compression.pm @@ -55,7 +55,7 @@ interact with the set of supported compr my $COMP = { diff --git a/archivers/engrampa/files/patch-src_fr-command-lrzip.c b/archivers/engrampa/files/patch-src_fr-command-lrzip.c index ae2d7d440482..3c17dd13d7c0 100644 --- a/archivers/engrampa/files/patch-src_fr-command-lrzip.c +++ b/archivers/engrampa/files/patch-src_fr-command-lrzip.c @@ -1,11 +1,11 @@ ---- src/fr-command-lrzip.c.orig 2010-08-26 12:40:56.000000000 -0400 -+++ src/fr-command-lrzip.c 2010-08-26 12:41:41.000000000 -0400 +--- src/fr-command-lrzip.c.orig 2015-10-14 17:33:41 UTC ++++ src/fr-command-lrzip.c @@ -53,7 +53,7 @@ list__process_line (char *line, struct stat st; - time_t tt; + if (stat (comm->filename, &st) == 0) - fdata->modified = st.st_mtim.tv_sec; + fdata->modified = st.st_mtime; else time(&(fdata->modified)); - fdata->modified; + diff --git a/archivers/engrampa/files/patch-src_fr-command-tar.c b/archivers/engrampa/files/patch-src_fr-command-tar.c index f80cbce7b080..8733b0399966 100644 --- a/archivers/engrampa/files/patch-src_fr-command-tar.c +++ b/archivers/engrampa/files/patch-src_fr-command-tar.c @@ -1,6 +1,6 @@ ---- src/fr-command-tar.c.orig 2014-11-19 15:44:09.000000000 +0100 -+++ src/fr-command-tar.c 2014-12-04 18:28:31.998497849 +0100 -@@ -245,6 +245,10 @@ +--- src/fr-command-tar.c.orig 2015-10-14 17:33:41 UTC ++++ src/fr-command-tar.c +@@ -245,6 +245,10 @@ begin_tar_command (FrCommand *comm) g_free (command); command = g_strdup ("/usr/sfw/bin/gtar"); } diff --git a/archivers/engrampa/files/patch-src_fr-command-zip.c b/archivers/engrampa/files/patch-src_fr-command-zip.c index ee9ec93de8c1..f650086b4d7c 100644 --- a/archivers/engrampa/files/patch-src_fr-command-zip.c +++ b/archivers/engrampa/files/patch-src_fr-command-zip.c @@ -1,5 +1,5 @@ ---- src/fr-command-zip.c.orig 2010-01-02 17:02:44.000000000 -0500 -+++ src/fr-command-zip.c 2010-01-02 17:08:03.000000000 -0500 +--- src/fr-command-zip.c.orig 2015-10-14 17:33:41 UTC ++++ src/fr-command-zip.c @@ -187,7 +187,11 @@ fr_command_zip_list (FrCommand *comm) { fr_process_set_out_line_func (comm->process, list__process_line, comm); @@ -11,8 +11,8 @@ +#endif fr_process_set_begin_func (comm->process, list__begin, comm); fr_process_add_arg (comm->process, "-ZTs"); - fr_process_add_arg (comm->process, comm->filename); -@@ -302,7 +306,11 @@ fr_command_zip_extract (FrCommand *comm + fr_process_add_arg (comm->process, "--"); +@@ -307,7 +311,11 @@ fr_command_zip_extract (FrCommand *comm process_line__common, comm); @@ -24,7 +24,7 @@ if (dest_dir != NULL) { fr_process_add_arg (comm->process, "-d"); -@@ -334,7 +342,11 @@ fr_command_zip_extract (FrCommand *comm +@@ -341,7 +349,11 @@ fr_command_zip_extract (FrCommand *comm static void fr_command_zip_test (FrCommand *comm) { @@ -36,4 +36,4 @@ +#endif fr_process_add_arg (comm->process, "-t"); add_password_arg (comm, comm->password); - fr_process_add_arg (comm->process, comm->filename); + fr_process_add_arg (comm->process, "--"); diff --git a/archivers/file-roller/files/patch-src_fr-command-tar.c b/archivers/file-roller/files/patch-src_fr-command-tar.c index 78843a28c6e9..c61478e72453 100644 --- a/archivers/file-roller/files/patch-src_fr-command-tar.c +++ b/archivers/file-roller/files/patch-src_fr-command-tar.c @@ -1,6 +1,6 @@ ---- src/fr-command-tar.c.orig Sun Oct 15 12:33:56 2006 -+++ src/fr-command-tar.c Mon Oct 16 19:18:03 2006 -@@ -231,6 +231,9 @@ +--- src/fr-command-tar.c.orig 2014-08-13 05:21:20 UTC ++++ src/fr-command-tar.c +@@ -236,6 +236,9 @@ begin_tar_command (FrCommand *comm) #if defined (__SVR4) && defined (__sun) if (g_file_test ("/usr/sfw/bin/gtar", G_FILE_TEST_IS_EXECUTABLE)) command = g_strdup ("/usr/sfw/bin/gtar"); diff --git a/archivers/file-roller/files/patch-src_fr-command-zip.c b/archivers/file-roller/files/patch-src_fr-command-zip.c index 5995813eb3b6..d55515487711 100644 --- a/archivers/file-roller/files/patch-src_fr-command-zip.c +++ b/archivers/file-roller/files/patch-src_fr-command-zip.c @@ -1,6 +1,6 @@ ---- src/fr-command-zip.c.orig 2010-11-16 08:32:18.000000000 +0000 -+++ src/fr-command-zip.c 2011-01-20 16:55:45.000000000 +0000 -@@ -186,7 +186,11 @@ fr_command_zip_list (FrCommand *comm) +--- src/fr-command-zip.c.orig 2015-02-15 10:13:10 UTC ++++ src/fr-command-zip.c +@@ -179,7 +179,11 @@ fr_command_zip_list (FrCommand *comm) { fr_process_set_out_line_func (comm->process, list__process_line, comm); @@ -11,8 +11,8 @@ +#endif fr_process_set_begin_func (comm->process, list__begin, comm); fr_process_add_arg (comm->process, "-ZTs"); - fr_process_add_arg (comm->process, comm->filename); -@@ -301,7 +305,11 @@ fr_command_zip_extract (FrCommand *comm + fr_process_add_arg (comm->process, "--"); +@@ -299,7 +303,11 @@ fr_command_zip_extract (FrCommand *comm process_line__common, comm); @@ -34,5 +34,5 @@ fr_process_begin_command (comm->process, "unzip"); +#endif fr_process_add_arg (comm->process, "-t"); - add_password_arg (comm, comm->password); - fr_process_add_arg (comm->process, comm->filename); + add_password_arg (comm, FR_ARCHIVE (comm)->password); + fr_process_add_arg (comm->process, "--"); diff --git a/archivers/freeze/files/patch-Makefile.in b/archivers/freeze/files/patch-Makefile.in index cb1a903c5805..52507b44f19c 100644 --- a/archivers/freeze/files/patch-Makefile.in +++ b/archivers/freeze/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- ./Makefile.in.orig 1993-02-24 14:36:56.000000000 +0100 -+++ ./Makefile.in 2014-02-13 12:44:47.785972991 +0100 -@@ -18,9 +18,9 @@ +--- Makefile.in.orig 1993-02-24 13:36:56 UTC ++++ Makefile.in +@@ -18,9 +18,9 @@ EXE = default: prog # Added the prefix macro, so that it was easier to change installation place. diff --git a/archivers/freeze/files/patch-freeze.c b/archivers/freeze/files/patch-freeze.c index e11bfc56fc92..128d63b03597 100644 --- a/archivers/freeze/files/patch-freeze.c +++ b/archivers/freeze/files/patch-freeze.c @@ -1,6 +1,6 @@ ---- ./freeze.c.orig 1993-02-24 14:36:55.000000000 +0100 -+++ ./freeze.c 2014-02-13 12:43:34.946976981 +0100 -@@ -176,7 +176,7 @@ +--- freeze.c.orig 1993-02-24 13:36:55 UTC ++++ freeze.c +@@ -176,7 +176,7 @@ void writeerr(), copystat(), version( /* From compress.c. Replace .Z --> .F etc */ diff --git a/archivers/freeze/files/patch-freeze.h b/archivers/freeze/files/patch-freeze.h index 10f052a8ab53..222843bb821d 100644 --- a/archivers/freeze/files/patch-freeze.h +++ b/archivers/freeze/files/patch-freeze.h @@ -1,5 +1,5 @@ ---- ./freeze.h.orig 1993-02-24 14:36:58.000000000 +0100 -+++ ./freeze.h 2014-02-13 12:43:34.947977110 +0100 +--- freeze.h.orig 1993-02-24 13:36:58 UTC ++++ freeze.h @@ -5,21 +5,6 @@ # include #endif diff --git a/archivers/ha/files/patch-nix_machine.c b/archivers/ha/files/patch-nix_machine.c index 0bdd3610fb1a..735343ea7fd5 100644 --- a/archivers/ha/files/patch-nix_machine.c +++ b/archivers/ha/files/patch-nix_machine.c @@ -1,19 +1,11 @@ -*** nix/machine.c.bak Thu Jan 12 09:53:00 1995 ---- nix/machine.c Tue Jan 24 19:38:07 1995 -*************** -*** 417,423 **** - if (plainname!=NULL) free(plainname),plainname=NULL; - if ((plainname=malloc(strlen(mdfullpath)+1))==NULL) - error(1,ERR_MEM,"md_stripname()"); -! for (i=strlen(mdfullpath)-1;i>0;i--) { - if (mdfullpath[i]=='/') { - i++; - break; ---- 417,423 ---- - if (plainname!=NULL) free(plainname),plainname=NULL; - if ((plainname=malloc(strlen(mdfullpath)+1))==NULL) - error(1,ERR_MEM,"md_stripname()"); -! for (i=strlen(mdfullpath)-1;i>=0;i--) { - if (mdfullpath[i]=='/') { - i++; - break; +--- nix/machine.c.orig 1995-01-12 06:53:00 UTC ++++ nix/machine.c +@@ -417,7 +417,7 @@ char *md_stripname(char *mdfullpath) { + if (plainname!=NULL) free(plainname),plainname=NULL; + if ((plainname=malloc(strlen(mdfullpath)+1))==NULL) + error(1,ERR_MEM,"md_stripname()"); +- for (i=strlen(mdfullpath)-1;i>0;i--) { ++ for (i=strlen(mdfullpath)-1;i>=0;i--) { + if (mdfullpath[i]=='/') { + i++; + break; diff --git a/archivers/hffzip/files/patch-Makefile b/archivers/hffzip/files/patch-Makefile index 4e275885d3ee..b8b4263a1fce 100644 --- a/archivers/hffzip/files/patch-Makefile +++ b/archivers/hffzip/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Wed Jun 11 07:59:00 2003 -+++ Makefile Wed Jun 11 08:00:47 2003 +--- Makefile.orig 2003-06-05 14:38:33 UTC ++++ Makefile @@ -1,16 +1,19 @@ -opzioni=-O3 +CFLAGS ?= ${CFLAGS} diff --git a/archivers/hlextract/files/patch-HLExtract-Main.c b/archivers/hlextract/files/patch-HLExtract-Main.c index c278a81f2bd8..5775195c39a4 100644 --- a/archivers/hlextract/files/patch-HLExtract-Main.c +++ b/archivers/hlextract/files/patch-HLExtract-Main.c @@ -1,6 +1,5 @@ -diff -ru ../orig/HLExtract/Main.c ./HLExtract/Main.c ---- ../orig/HLExtract/Main.c 2011-09-17 00:41:54.000000000 -0300 -+++ ./HLExtract/Main.c 2013-02-11 18:29:02.880217165 -0200 +--- HLExtract/Main.c.orig 2016-07-26 11:59:22 UTC ++++ HLExtract/Main.c @@ -52,7 +52,7 @@ # define WIN32_LEAN_AND_MEAN # include @@ -10,7 +9,7 @@ diff -ru ../orig/HLExtract/Main.c ./HLExtract/Main.c # define MAX_PATH PATH_MAX # define FOREGROUND_BLUE 0x0001 -@@ -618,15 +618,15 @@ +@@ -618,15 +618,15 @@ hlVoid PrintUsage() printf("\n"); printf("Example HLExtract usage:\n"); #ifdef _WIN32 @@ -34,7 +33,7 @@ diff -ru ../orig/HLExtract/Main.c ./HLExtract/Main.c #endif } -@@ -657,6 +657,8 @@ +@@ -657,6 +657,8 @@ hlVoid List(FILE *pFile, HLDirectoryItem fprintf(pFile, "%s\n", lpPath); } break; @@ -43,7 +42,7 @@ diff -ru ../orig/HLExtract/Main.c ./HLExtract/Main.c } } -@@ -843,6 +845,8 @@ +@@ -843,6 +845,8 @@ HLValidation Validate(HLDirectoryItem *p PrintValidation(eValidation); printf("\n"); break; @@ -52,7 +51,7 @@ diff -ru ../orig/HLExtract/Main.c ./HLExtract/Main.c } } else -@@ -851,6 +855,8 @@ +@@ -851,6 +855,8 @@ HLValidation Validate(HLDirectoryItem *p printf(" \n"); } break; @@ -61,7 +60,7 @@ diff -ru ../orig/HLExtract/Main.c ./HLExtract/Main.c } return eValidation; -@@ -882,6 +888,8 @@ +@@ -882,6 +888,8 @@ hlVoid PrintAttribute(hlChar *lpPrefix, case HL_ATTRIBUTE_STRING: printf("%s%s: %s%s\n", lpPrefix, pAttribute->lpName, pAttribute->Value.String.lpValue, lpPostfix); break; @@ -70,7 +69,7 @@ diff -ru ../orig/HLExtract/Main.c ./HLExtract/Main.c } } -@@ -1151,6 +1159,8 @@ +@@ -1151,6 +1159,8 @@ hlVoid EnterConsole(hlUInt uiPackage, hl printf(" Size: %u B\n", hlFileGetSize(pSubItem)); printf(" Size On Disk: %u B\n", hlFileGetSizeOnDisk(pSubItem)); break; @@ -79,4 +78,3 @@ diff -ru ../orig/HLExtract/Main.c ./HLExtract/Main.c } uiItemCount = hlPackageGetItemAttributeCount(); -Only in ./HLExtract: Main.c.bak diff --git a/archivers/hpack.non-usa.only/files/patch-archive.c b/archivers/hpack.non-usa.only/files/patch-archive.c index 31c668f04727..7d7c6bd93ae7 100644 --- a/archivers/hpack.non-usa.only/files/patch-archive.c +++ b/archivers/hpack.non-usa.only/files/patch-archive.c @@ -1,6 +1,6 @@ ---- archive.c.orig Tue Jun 29 05:27:52 1993 -+++ archive.c Tue Dec 28 20:01:38 1999 -@@ -326,12 +326,22 @@ +--- archive.c.orig 1993-06-29 10:27:52 UTC ++++ archive.c +@@ -326,12 +326,22 @@ BOOLEAN confirmSkip( const char *str1, c void getFileName( char *fileName ) { diff --git a/archivers/hpack.non-usa.only/files/patch-cli.c b/archivers/hpack.non-usa.only/files/patch-cli.c index 92f804937070..0693258803b3 100644 --- a/archivers/hpack.non-usa.only/files/patch-cli.c +++ b/archivers/hpack.non-usa.only/files/patch-cli.c @@ -1,6 +1,6 @@ ---- cli.c.orig Sat Sep 4 22:23:48 1993 -+++ cli.c Tue Dec 28 20:01:38 1999 -@@ -724,12 +724,18 @@ +--- cli.c.orig 1993-09-05 03:23:48 UTC ++++ cli.c +@@ -724,12 +724,18 @@ static BOOLEAN checkStealthMode( char *a void doConfigFile( void ) { diff --git a/archivers/hpack.non-usa.only/files/patch-crypt_keymgmt.c b/archivers/hpack.non-usa.only/files/patch-crypt_keymgmt.c index 689ba37f6b94..9c951c3e4b48 100644 --- a/archivers/hpack.non-usa.only/files/patch-crypt_keymgmt.c +++ b/archivers/hpack.non-usa.only/files/patch-crypt_keymgmt.c @@ -1,6 +1,6 @@ ---- crypt/keymgmt.c.orig Tue Aug 17 16:56:14 1993 -+++ crypt/keymgmt.c Tue Dec 28 20:01:38 1999 -@@ -495,11 +495,24 @@ +--- crypt/keymgmt.c.orig 1993-08-17 21:56:14 UTC ++++ crypt/keymgmt.c +@@ -495,11 +495,24 @@ BOOLEAN getKey( const BOOLEAN isPemKey, FD keyFileFD, savedInFD = getInputFD(); BOOLEAN matched, firstTime = TRUE; char *matchID, firstChar; diff --git a/archivers/hpack.non-usa.only/files/patch-defs.h b/archivers/hpack.non-usa.only/files/patch-defs.h index c993b1058dba..4b885846d019 100644 --- a/archivers/hpack.non-usa.only/files/patch-defs.h +++ b/archivers/hpack.non-usa.only/files/patch-defs.h @@ -1,6 +1,6 @@ ---- defs.h.orig Mon May 31 10:17:00 1993 -+++ defs.h Tue Dec 28 20:01:38 1999 -@@ -43,7 +43,7 @@ +--- defs.h.orig 1993-05-31 15:17:00 UTC ++++ defs.h +@@ -43,7 +43,7 @@ typedef int BOOLEAN; /* 'inline' patch for compilers which can't handle this */ diff --git a/archivers/hpack.non-usa.only/files/patch-hpacklib.h b/archivers/hpack.non-usa.only/files/patch-hpacklib.h index cc178b89f5d3..5779136c41fb 100644 --- a/archivers/hpack.non-usa.only/files/patch-hpacklib.h +++ b/archivers/hpack.non-usa.only/files/patch-hpacklib.h @@ -1,5 +1,5 @@ ---- hpacklib.h.orig Thu Aug 5 04:10:40 1993 -+++ hpacklib.h Tue Dec 28 20:01:38 1999 +--- hpacklib.h.orig 1993-08-05 09:10:40 UTC ++++ hpacklib.h @@ -26,12 +26,12 @@ #include /* Prototypes for generic functions */ diff --git a/archivers/hpack.non-usa.only/files/patch-keycvt_keycvt.c b/archivers/hpack.non-usa.only/files/patch-keycvt_keycvt.c index 2ef0a9d78471..3a601cc17dbd 100644 --- a/archivers/hpack.non-usa.only/files/patch-keycvt_keycvt.c +++ b/archivers/hpack.non-usa.only/files/patch-keycvt_keycvt.c @@ -1,6 +1,6 @@ ---- keycvt/keycvt.c.orig Fri Aug 13 15:06:28 1993 -+++ keycvt/keycvt.c Tue Dec 28 20:01:38 1999 -@@ -582,11 +582,21 @@ +--- keycvt/keycvt.c.orig 1993-08-13 20:06:28 UTC ++++ keycvt/keycvt.c +@@ -582,11 +582,21 @@ static void byteReverse( BYTE *regPtr, i static void getPassword( void ) { @@ -22,7 +22,7 @@ } void initCrypt( void ) -@@ -1020,27 +1030,46 @@ +@@ -1020,27 +1030,46 @@ int main( const int argc, const char *ar /* Try and find the PGP seed file */ if( ( pgpPath = getenv( "PGPPATH" ) ) == NULL ) diff --git a/archivers/hpack.non-usa.only/files/patch-keycvt_makefile b/archivers/hpack.non-usa.only/files/patch-keycvt_makefile index 7d6de4115cda..09e76e370464 100644 --- a/archivers/hpack.non-usa.only/files/patch-keycvt_makefile +++ b/archivers/hpack.non-usa.only/files/patch-keycvt_makefile @@ -1,6 +1,6 @@ ---- keycvt/makefile.orig Tue May 18 00:43:30 1993 -+++ keycvt/makefile Sun Jul 21 17:32:13 2002 -@@ -48,7 +48,7 @@ +--- keycvt/makefile.orig 1993-05-17 21:43:30 UTC ++++ keycvt/makefile +@@ -48,7 +48,7 @@ DEFINES = $(OS) PROJ = keycvt @@ -9,7 +9,7 @@ LFLAGS = -o $(PROJ) $(CMDL) # Flags for linker -@@ -60,6 +60,7 @@ +@@ -60,6 +60,7 @@ LD = $(CC) # Linker (just use the C LS = ls -l # Directory command ECHO = echo # Echo to screen command MAKE = make # The make command @@ -17,7 +17,7 @@ #**************************************************************************** #* * -@@ -71,7 +72,7 @@ +@@ -71,7 +72,7 @@ default: @$(ECHO) @$(ECHO) "To create KEYCVT you have to enter the Unix system type you want to build" @$(ECHO) "KEYCVT for. Possible options are: aix (RS6000), aix370, aix386, convex," @@ -26,16 +26,16 @@ @$(ECHO) "(Ultrix 3.x or earlier), and uts4. If none of the above fit, try" @$(ECHO) "'make generic', and send a copy of any changes necessary to the author," @$(ECHO) "pgut1@cs.aukuni.ac.nz" -@@ -128,6 +129,12 @@ - +@@ -129,6 +130,12 @@ aix386: convex: @$(MAKE) keycvt CC="cc" -+ + +freebsd: + @$(MAKE) $(PROJ) + +freebsd.install: + $(BSD_INSTALL_PROGRAM) $(PROJ) $(PREFIX)/bin - ++ # Generic: Generic BSD-ish system running gcc. Can't continue, we really # need user intervention here. + diff --git a/archivers/hpack.non-usa.only/files/patch-language_language.c b/archivers/hpack.non-usa.only/files/patch-language_language.c index c4d33be961a9..c052f184d3ad 100644 --- a/archivers/hpack.non-usa.only/files/patch-language_language.c +++ b/archivers/hpack.non-usa.only/files/patch-language_language.c @@ -1,6 +1,6 @@ ---- language/language.c.orig Wed Sep 22 21:23:20 1993 -+++ language/language.c Tue Dec 28 20:01:38 1999 -@@ -188,7 +188,7 @@ +--- language/language.c.orig 1993-09-23 02:23:20 UTC ++++ language/language.c +@@ -188,7 +188,7 @@ void showHelp( void ) /* Process user response */ response = hgetch(); response = toupper( response ); /* Damn macros */ @@ -9,7 +9,7 @@ if( response == RESPONSE_QUIT ) return; lineNo -= ( response == ' ' ) ? screenHeight : 1; -@@ -268,6 +268,9 @@ +@@ -268,6 +268,9 @@ int initMessages( const char *path, cons if( ( inFD = hopen( fileNamePtr, O_RDONLY | S_DENYWR | A_RANDSEQ ) ) == ERROR ) return( ERROR ); #elif defined( __UNIX__ ) @@ -19,7 +19,7 @@ /* Build path to language file and try and process it */ fileNamePtr = getFirstKeyPath( getenv( "PATH" ), DATA_FILENAME ); while( fileNamePtr != NULL ) -@@ -290,6 +293,9 @@ +@@ -290,6 +293,9 @@ int initMessages( const char *path, cons return( ERROR ); /* Couldn't find/open input file */ } #endif /* System-specific handling of how to find language defn.file */ diff --git a/archivers/hpack.non-usa.only/files/patch-system.h b/archivers/hpack.non-usa.only/files/patch-system.h index 5988653572d8..91bba18dd6d5 100644 --- a/archivers/hpack.non-usa.only/files/patch-system.h +++ b/archivers/hpack.non-usa.only/files/patch-system.h @@ -1,6 +1,6 @@ ---- system.h.orig Fri Aug 27 12:16:40 1993 -+++ system.h Tue Dec 28 20:01:38 1999 -@@ -788,7 +788,10 @@ +--- system.h.orig 1993-08-27 17:16:40 UTC ++++ system.h +@@ -788,7 +788,10 @@ void strlwr( char *string ); #elif defined( CONVEX ) #define MAX_PATH ( _POSIX_PATH_MAX + 1 ) #define MAX_FILENAME ( 254 + 1 ) @@ -12,7 +12,7 @@ #define MAX_PATH ( _POSIX_PATH_MAX + 1 ) #define MAX_FILENAME ( NAME_MAX + 1 ) #elif defined( SVR4 ) -@@ -875,7 +878,8 @@ +@@ -875,7 +878,8 @@ typedef struct { #if defined( AIX ) || defined( AIX386 ) || defined( AIX370 ) || \ defined( BSD386 ) || defined( GENERIC ) || defined( HPUX ) || \ defined( IRIX ) || defined( NEXT ) || defined( OSF1 ) || \ @@ -22,7 +22,7 @@ #define SPACE_OK TRUE #else #define SPACE_OK FALSE -@@ -948,6 +952,13 @@ +@@ -948,6 +952,13 @@ typedef struct { #elif defined( UTS4 ) /* Amdahl UTS4 */ #define NEED_STRLWR #define NEED_STRICMP diff --git a/archivers/hpack.non-usa.only/files/patch-system_unix.c b/archivers/hpack.non-usa.only/files/patch-system_unix.c index 0e67e42e5cb6..bedab817934e 100644 --- a/archivers/hpack.non-usa.only/files/patch-system_unix.c +++ b/archivers/hpack.non-usa.only/files/patch-system_unix.c @@ -1,6 +1,6 @@ ---- system/unix.c.orig Fri Aug 27 12:20:56 1993 -+++ system/unix.c Tue Dec 28 20:01:38 1999 -@@ -123,7 +123,7 @@ +--- system/unix.c.orig 1993-08-27 17:20:56 UTC ++++ system/unix.c +@@ -123,7 +123,7 @@ static int randomBufferPos = 0; #if defined( BSD386 ) || defined( CONVEX ) || defined( HPUX ) || \ defined( IRIX ) || defined( LINUX ) || defined( POSIX ) || \ @@ -9,7 +9,7 @@ #include -@@ -144,7 +144,7 @@ +@@ -144,7 +144,7 @@ int hgetch( void ) tcgetattr( ttyFD, &ttyInfo ); #if defined( BSD386 ) || defined( CONVEX ) || defined( HPUX ) || \ defined( IRIX ) || defined( LINUX ) || defined( POSIX ) || \ @@ -18,7 +18,7 @@ ttyInfo.c_lflag &= ~ECHO; ttyInfo.c_lflag &= ~ICANON; #else -@@ -183,7 +183,7 @@ +@@ -183,7 +183,7 @@ int hgetch( void ) tcgetattr( ttyFD, &ttyInfo ); #if defined( BSD386 ) || defined( CONVEX ) || defined( HPUX ) || \ defined( IRIX ) || defined( LINUX ) || defined( POSIX ) || \ @@ -27,7 +27,7 @@ ttyInfo.c_lflag |= ECHO; ttyInfo.c_lflag |= ICANON; #else -@@ -728,7 +728,7 @@ +@@ -728,7 +728,7 @@ int getCountry( void ) defined( HPUX ) || defined( IRIX ) || defined( LINUX ) || \ defined( NEXT ) || defined( OSF1 ) || defined( SUNOS ) || \ defined( SVR4 ) || defined( ULTRIX ) || defined( ULTRIX_OLD ) || \ diff --git a/archivers/lbzip2/files/patch-Makefile b/archivers/lbzip2/files/patch-Makefile index c0ff177ee3de..2d1b1c5ccb51 100644 --- a/archivers/lbzip2/files/patch-Makefile +++ b/archivers/lbzip2/files/patch-Makefile @@ -1,18 +1,18 @@ ---- Makefile.orig 2009-01-25 18:27:52.000000000 +0100 -+++ Makefile 2009-02-07 18:56:15.000000000 +0100 +--- Makefile.orig 2009-04-03 22:33:49 UTC ++++ Makefile @@ -1,15 +1,10 @@ - # Makefile,v 1.8 2009-01-25 17:27:52 lacos Exp + # Makefile,v 1.9 2009/04/03 22:33:49 lacos Exp .POSIX: -CC=gcc -CFLAGS=$$($(SHELL) lfs.sh CFLAGS) -D _XOPEN_SOURCE=500 -pipe -ansi -pedantic \ - -O2 +- +- +- +LDFLAGS+= -s +LIBS+= -l pthread -l bz2 -- -- -- -LDFLAGS=-s $$($(SHELL) lfs.sh LDFLAGS) -LIBS=-l pthread -l bz2 $$($(SHELL) lfs.sh LIBS) +all: lbzip2 diff --git a/archivers/lha-ac/files/patch-lha.h b/archivers/lha-ac/files/patch-src_lha.h similarity index 61% rename from archivers/lha-ac/files/patch-lha.h rename to archivers/lha-ac/files/patch-src_lha.h index 56cf5ba4b970..808692bab78c 100644 --- a/archivers/lha-ac/files/patch-lha.h +++ b/archivers/lha-ac/files/patch-src_lha.h @@ -1,5 +1,5 @@ ---- src/lha.h.orig Sun Sep 21 15:58:52 2003 -+++ src/lha.h Thu Sep 23 07:10:33 2004 +--- src/lha.h.orig 2006-10-10 16:27:51 UTC ++++ src/lha.h @@ -16,6 +16,7 @@ #endif diff --git a/archivers/libarc/files/patch-Makefile b/archivers/libarc/files/patch-Makefile index 6601419ad2df..50787c4184f1 100644 --- a/archivers/libarc/files/patch-Makefile +++ b/archivers/libarc/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile Tue Jun 13 07:21:19 2000 -+++ Makefile Tue Jun 20 17:44:24 2000 -@@ -14,20 +15,30 @@ +--- Makefile.orig 2000-06-13 04:21:19 UTC ++++ Makefile +@@ -14,23 +14,33 @@ OBJS = inflate.o url.o url_file.o url_in url_hqxdecode.o url_qsdecode.o url_news.o url_newsgroup.o url_cgiesc.o \ arc_mime.o @@ -36,3 +36,6 @@ + +.c.so: + $(CC) $(CFLAGS) -fPIC -fpic -DPIC -c $(.IMPSRC) -o $(.TARGET) + install:: + test -d $(PREFIX)/lib || mkdir -p $(PREFIX)/lib + $(INSTALL) -m 444 $(LIB) $(PREFIX)/lib diff --git a/archivers/libcabinet/files/patch-Makefile b/archivers/libcabinet/files/patch-Makefile index 01e67ad0e9fc..cdf7152ad4fc 100644 --- a/archivers/libcabinet/files/patch-Makefile +++ b/archivers/libcabinet/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Tue Aug 19 18:15:11 2003 -+++ Makefile Tue Aug 19 18:33:06 2003 +--- Makefile.orig 2016-07-26 12:03:27 UTC ++++ Makefile @@ -0,0 +1,16 @@ +NO_PROFILE= true +CXXFLAGS+= -Wno-deprecated diff --git a/archivers/libcabinet/files/patch-bstring.cpp b/archivers/libcabinet/files/patch-bstring.cpp index c4f88c8138f2..b37512ddc7b3 100644 --- a/archivers/libcabinet/files/patch-bstring.cpp +++ b/archivers/libcabinet/files/patch-bstring.cpp @@ -1,5 +1,5 @@ ---- bstring.cpp.orig 2014-07-27 11:17:34.000000000 -0400 -+++ bstring.cpp 2014-07-27 11:17:37.000000000 -0400 +--- bstring.cpp.orig 1999-10-24 11:29:53 UTC ++++ bstring.cpp @@ -15,7 +15,7 @@ #include "bstring.h" @@ -9,7 +9,7 @@ ///////////////////////////////////////*************************************** -@@ -91,7 +91,7 @@ +@@ -91,7 +91,7 @@ b_string& b_string::operator += (const c b_string b_string::operator + (const char* s) { @@ -18,7 +18,7 @@ return temp += s; } -@@ -150,7 +150,7 @@ +@@ -150,7 +150,7 @@ b_string& b_string::StpCpy(const char* s if(strlen(str) < strlen(s)) // If more memory is needed *this = s; // Use assign function else // If stpcpy can be used @@ -27,7 +27,7 @@ } return *this; // Return a refrence to this object -@@ -217,4 +217,4 @@ +@@ -217,4 +217,4 @@ istream& operator >> (istream& input, b_ //*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/ diff --git a/archivers/libcabinet/files/patch-bstring.h b/archivers/libcabinet/files/patch-bstring.h index 77047321f149..ff19e14260b7 100644 --- a/archivers/libcabinet/files/patch-bstring.h +++ b/archivers/libcabinet/files/patch-bstring.h @@ -1,5 +1,5 @@ ---- bstring.h.orig 1999-10-24 07:29:53.000000000 -0400 -+++ bstring.h 2014-02-21 16:09:56.194556928 -0500 +--- bstring.h.orig 1999-10-24 11:29:53 UTC ++++ bstring.h @@ -21,13 +21,15 @@ #ifndef __BSTRING_HPP__ #define __BSTRING_HPP__ diff --git a/archivers/libcabinet/files/patch-cfcreate.cpp b/archivers/libcabinet/files/patch-cfcreate.cpp index 029861262d78..2dd4b65325d6 100644 --- a/archivers/libcabinet/files/patch-cfcreate.cpp +++ b/archivers/libcabinet/files/patch-cfcreate.cpp @@ -1,5 +1,5 @@ ---- cfcreate.cpp.orig 1999-10-24 07:29:53.000000000 -0400 -+++ cfcreate.cpp 2014-02-21 15:48:26.812268415 -0500 +--- cfcreate.cpp.orig 1999-10-24 11:29:53 UTC ++++ cfcreate.cpp @@ -29,6 +29,10 @@ #include #endif @@ -11,7 +11,7 @@ ///////////////////////////////////////*************************************** int cfc_fileinfo::write_entry(ostream& out) -@@ -129,7 +133,7 @@ +@@ -129,7 +133,7 @@ int cfc_folderinfo::add_file(const char* } } @@ -20,7 +20,7 @@ #ifndef unix if(getftime(in.rdbuf()->fd(), &datetime) != 0) return GETTIME_FAILURE; #endif -@@ -194,7 +198,7 @@ +@@ -194,7 +198,7 @@ int cfc_folderinfo::read_block(istream& unprocessed_data = NULL; // Reset buffer holder unprocessed_data_len = 0u; @@ -29,7 +29,7 @@ { delete[] buf; buf = NULL; -@@ -272,7 +276,7 @@ +@@ -272,7 +276,7 @@ int cfc_folderinfo::process_block(const return WRITE_ERROR; } diff --git a/archivers/libcabinet/files/patch-cfcreate.h b/archivers/libcabinet/files/patch-cfcreate.h index 023e4a6b9602..de0dc7e5ed41 100644 --- a/archivers/libcabinet/files/patch-cfcreate.h +++ b/archivers/libcabinet/files/patch-cfcreate.h @@ -1,5 +1,5 @@ ---- cfcreate.h.orig 1999-10-24 07:29:53.000000000 -0400 -+++ cfcreate.h 2014-02-21 15:47:18.116272433 -0500 +--- cfcreate.h.orig 1999-10-24 11:29:53 UTC ++++ cfcreate.h @@ -20,6 +20,8 @@ #include "cffile.h" #include "zlib.h" @@ -9,7 +9,7 @@ #ifdef unix #include #endif -@@ -211,7 +213,7 @@ +@@ -211,7 +213,7 @@ class cfc_folderinfo : public ObjectBase int process_block(const byte* data, word datalen); int read_block(istream& in, byte* &buf, int& bytesread); int compress_block(byte* &dest, word &destlen, byte* src, word srclen); diff --git a/archivers/libcabinet/files/patch-cfdblock.cpp b/archivers/libcabinet/files/patch-cfdblock.cpp index 63e1ebde2a80..b11eb74a96db 100644 --- a/archivers/libcabinet/files/patch-cfdblock.cpp +++ b/archivers/libcabinet/files/patch-cfdblock.cpp @@ -1,5 +1,5 @@ ---- cfdblock.cpp.orig 1999-10-24 02:13:29.000000000 -0400 -+++ cfdblock.cpp 2014-02-21 15:49:13.695264850 -0500 +--- cfdblock.cpp.orig 1999-10-24 06:13:29 UTC ++++ cfdblock.cpp @@ -17,7 +17,7 @@ #ifndef __CFDBLOCK_CPP__ #define __CFDBLOCK_CPP__ @@ -9,7 +9,7 @@ #include "cftypes.h" #include "cfdblock.h" #include "cfheader.h" -@@ -124,7 +124,7 @@ +@@ -124,7 +124,7 @@ int cabinet_datablock::read(istream& in, ra_size = cab_header.get_datablock_ra_size(); reserved_area = new byte[ra_size]; @@ -18,7 +18,7 @@ { return (in.fail()) ? READ_ERROR : UNEXPECTED_EOF; } -@@ -154,7 +154,7 @@ +@@ -154,7 +154,7 @@ int cabinet_datablock::write(ostream& ou if(ra_size) // If reserve area, write it { diff --git a/archivers/libcabinet/files/patch-cfdblock.h b/archivers/libcabinet/files/patch-cfdblock.h index 05fa803caccd..7de70e3720fb 100644 --- a/archivers/libcabinet/files/patch-cfdblock.h +++ b/archivers/libcabinet/files/patch-cfdblock.h @@ -1,5 +1,5 @@ ---- cfdblock.h.orig 2014-02-21 15:49:53.526262379 -0500 -+++ cfdblock.h 2014-02-21 15:50:02.511261600 -0500 +--- cfdblock.h.orig 1999-10-24 06:13:29 UTC ++++ cfdblock.h @@ -14,7 +14,7 @@ #ifndef __CFDBLOCK_H__ #define __CFDBLOCK_H__ diff --git a/archivers/libcabinet/files/patch-cffdrmgr.cpp b/archivers/libcabinet/files/patch-cffdrmgr.cpp index 88210e589287..a592124c1f34 100644 --- a/archivers/libcabinet/files/patch-cffdrmgr.cpp +++ b/archivers/libcabinet/files/patch-cffdrmgr.cpp @@ -1,5 +1,5 @@ ---- cffdrmgr.cpp.orig 2014-02-21 15:50:45.048258834 -0500 -+++ cffdrmgr.cpp 2014-02-21 15:50:53.033257685 -0500 +--- cffdrmgr.cpp.orig 1999-10-24 11:29:53 UTC ++++ cffdrmgr.cpp @@ -12,7 +12,7 @@ #ifndef __CFFDRMGR_CPP__ #define __CFFDRMGR_CPP__ diff --git a/archivers/libcabinet/files/patch-cffdrmgr.h b/archivers/libcabinet/files/patch-cffdrmgr.h index 5d44fcd11ad5..9c879ee68c8e 100644 --- a/archivers/libcabinet/files/patch-cffdrmgr.h +++ b/archivers/libcabinet/files/patch-cffdrmgr.h @@ -1,5 +1,5 @@ ---- cffdrmgr.h.orig 2014-02-21 15:51:05.912257936 -0500 -+++ cffdrmgr.h 2014-02-21 15:51:13.426256130 -0500 +--- cffdrmgr.h.orig 1999-10-24 06:13:29 UTC ++++ cffdrmgr.h @@ -9,7 +9,7 @@ #ifndef __CFFDRMGR_H__ #define __CFFDRMGR_H__ diff --git a/archivers/libcabinet/files/patch-cffile.cpp b/archivers/libcabinet/files/patch-cffile.cpp index 4ccda8e072fe..b9c2414d93df 100644 --- a/archivers/libcabinet/files/patch-cffile.cpp +++ b/archivers/libcabinet/files/patch-cffile.cpp @@ -1,5 +1,5 @@ ---- cffile.cpp.orig 2014-02-21 15:52:54.235249989 -0500 -+++ cffile.cpp 2014-02-21 15:53:02.965814752 -0500 +--- cffile.cpp.orig 1999-10-24 06:13:29 UTC ++++ cffile.cpp @@ -17,7 +17,7 @@ #ifndef __CFFILE_CPP__ #define __CFFILE_CPP__ diff --git a/archivers/libcabinet/files/patch-cffile.h b/archivers/libcabinet/files/patch-cffile.h index 6bbe343a01e8..9be0bb42337f 100644 --- a/archivers/libcabinet/files/patch-cffile.h +++ b/archivers/libcabinet/files/patch-cffile.h @@ -1,5 +1,5 @@ ---- cffile.h.orig 1999-10-24 02:13:29.000000000 -0400 -+++ cffile.h 2014-02-21 16:12:05.824389036 -0500 +--- cffile.h.orig 1999-10-24 06:13:29 UTC ++++ cffile.h @@ -15,7 +15,7 @@ #define __CFFILE_H__ @@ -9,7 +9,7 @@ #include "bstring.h" #include "cftypes.h" -@@ -161,4 +161,4 @@ +@@ -161,4 +161,4 @@ class cabinet_file_header : public cabin //////////////////////////////////////////////////////////////////////////////// diff --git a/archivers/libcabinet/files/patch-cffolder.cpp b/archivers/libcabinet/files/patch-cffolder.cpp index 8eed0dea64a9..d9b15c0fbb17 100644 --- a/archivers/libcabinet/files/patch-cffolder.cpp +++ b/archivers/libcabinet/files/patch-cffolder.cpp @@ -1,5 +1,5 @@ ---- cffolder.cpp.orig 1999-10-24 02:13:29.000000000 -0400 -+++ cffolder.cpp 2014-02-21 15:53:49.255245183 -0500 +--- cffolder.cpp.orig 1999-10-24 06:13:29 UTC ++++ cffolder.cpp @@ -17,7 +17,7 @@ #ifndef __CFFOLDER_CPP__ #define __CFFOLDER_CPP__ @@ -9,7 +9,7 @@ #include "cftypes.h" #include "cfheader.h" #include "cffolder.h" -@@ -70,7 +70,7 @@ +@@ -70,7 +70,7 @@ Error cabinet_folder_header::read(istrea ra_size = cab_header.get_folder_ra_size(); reserved_area = new byte[ra_size]; @@ -18,7 +18,7 @@ { return (in.fail()) ? READ_ERROR : UNEXPECTED_EOF; } -@@ -90,7 +90,7 @@ +@@ -90,7 +90,7 @@ Error cabinet_folder_header::write(ostre if(ra_size) // If reserved area present { diff --git a/archivers/libcabinet/files/patch-cffolder.h b/archivers/libcabinet/files/patch-cffolder.h index 8aeac9d936e2..513bbdebaba0 100644 --- a/archivers/libcabinet/files/patch-cffolder.h +++ b/archivers/libcabinet/files/patch-cffolder.h @@ -1,5 +1,5 @@ ---- cffolder.h.orig 1999-10-24 02:13:29.000000000 -0400 -+++ cffolder.h 2014-02-21 15:52:05.724747639 -0500 +--- cffolder.h.orig 1999-10-24 06:13:29 UTC ++++ cffolder.h @@ -15,7 +15,7 @@ #define __CFFOLDER_H__ @@ -9,7 +9,7 @@ #include "cftypes.h" #include "cfheader.h" -@@ -89,4 +89,5 @@ +@@ -89,4 +89,5 @@ class cabinet_folder_header : public cab //////////////////////////////////////////////////////////////////////////////// diff --git a/archivers/libcabinet/files/patch-cfheader.cpp b/archivers/libcabinet/files/patch-cfheader.cpp index 4d026b5e760a..ffa18a9dbde2 100644 --- a/archivers/libcabinet/files/patch-cfheader.cpp +++ b/archivers/libcabinet/files/patch-cfheader.cpp @@ -1,5 +1,5 @@ ---- cfheader.cpp.orig 1999-10-24 02:13:29.000000000 -0400 -+++ cfheader.cpp 2014-02-21 16:02:37.285291121 -0500 +--- cfheader.cpp.orig 1999-10-24 06:13:29 UTC ++++ cfheader.cpp @@ -18,17 +18,23 @@ #define __CFHEADER_CPP__ @@ -26,7 +26,7 @@ ////////////////////////////////////////**************************************** // Initializes a valid fixed cabinet header -@@ -127,7 +133,7 @@ +@@ -127,7 +133,7 @@ Error cabinet_header::read(istream& in) { reserved_area = new byte[cabinet_ra_size]; @@ -35,7 +35,7 @@ { return (in.fail()) ? READ_ERROR : UNEXPECTED_EOF; } -@@ -172,7 +178,7 @@ +@@ -172,7 +178,7 @@ Error cabinet_header::write(ostream& out if(cabinet_ra_size > 0) // If has cabinet reserved area { @@ -44,7 +44,7 @@ { return WRITE_ERROR; } -@@ -210,4 +216,4 @@ +@@ -210,4 +216,4 @@ Error cabinet_header::write(ostream& out ////////////////////////////////////////**************************************** diff --git a/archivers/libcabinet/files/patch-cfheader.h b/archivers/libcabinet/files/patch-cfheader.h index 9baa26596835..c794c265e38c 100644 --- a/archivers/libcabinet/files/patch-cfheader.h +++ b/archivers/libcabinet/files/patch-cfheader.h @@ -1,5 +1,5 @@ ---- cfheader.h.orig 2014-02-21 15:42:52.379291286 -0500 -+++ cfheader.h 2014-02-21 16:02:51.918208148 -0500 +--- cfheader.h.orig 1999-10-24 06:13:29 UTC ++++ cfheader.h @@ -15,10 +15,12 @@ #define __CFHEADER_H__ diff --git a/archivers/libcabinet/files/patch-cfreader.cpp b/archivers/libcabinet/files/patch-cfreader.cpp index e68813fdf8a1..bebea6172356 100644 --- a/archivers/libcabinet/files/patch-cfreader.cpp +++ b/archivers/libcabinet/files/patch-cfreader.cpp @@ -1,5 +1,5 @@ ---- cfreader.cpp.orig 1999-10-24 02:13:29.000000000 -0400 -+++ cfreader.cpp 2014-02-21 15:55:15.698239494 -0500 +--- cfreader.cpp.orig 1999-10-24 06:13:29 UTC ++++ cfreader.cpp @@ -22,7 +22,7 @@ #include #include diff --git a/archivers/libcabinet/files/patch-cfreader.h b/archivers/libcabinet/files/patch-cfreader.h index 1dba9a5085b8..af8c9703b4e3 100644 --- a/archivers/libcabinet/files/patch-cfreader.h +++ b/archivers/libcabinet/files/patch-cfreader.h @@ -1,5 +1,5 @@ ---- cfreader.h.orig 2014-02-21 16:11:11.770180090 -0500 -+++ cfreader.h 2014-02-21 16:10:41.259844074 -0500 +--- cfreader.h.orig 1999-10-24 06:13:29 UTC ++++ cfreader.h @@ -11,7 +11,7 @@ #ifndef __CFREADER_H__ #define __CFREADER_H__ diff --git a/archivers/libcabinet/files/patch-cftypes.cpp b/archivers/libcabinet/files/patch-cftypes.cpp index 437a41632e84..c3285a7b4951 100644 --- a/archivers/libcabinet/files/patch-cftypes.cpp +++ b/archivers/libcabinet/files/patch-cftypes.cpp @@ -1,5 +1,5 @@ ---- cftypes.cpp.orig 1999-10-24 02:13:29.000000000 -0400 -+++ cftypes.cpp 2014-02-21 16:06:43.971192116 -0500 +--- cftypes.cpp.orig 1999-10-24 06:13:29 UTC ++++ cftypes.cpp @@ -10,11 +10,20 @@ #ifndef __CFTYPES_CPP__ #define __CFTYPES_CPP__ @@ -23,7 +23,7 @@ /******************************************************************************/ int convert_z_error_code(int code) -@@ -138,15 +147,20 @@ +@@ -138,15 +147,20 @@ const char* get_cabinet_error_string(int int io_read(istream& in, byte* buf, word len) { @@ -49,7 +49,7 @@ ? (in.fail()) ? READ_ERROR : UNEXPECTED_EOF : OK; } -@@ -154,14 +168,19 @@ +@@ -154,14 +168,19 @@ int io_read(istream& in, byte* buf, word int io_write(ostream& out, const byte* buf, word len) { diff --git a/archivers/libcabinet/files/patch-cftypes.h b/archivers/libcabinet/files/patch-cftypes.h index dd814b0dfab1..0c393d281208 100644 --- a/archivers/libcabinet/files/patch-cftypes.h +++ b/archivers/libcabinet/files/patch-cftypes.h @@ -1,5 +1,5 @@ ---- cftypes.h.orig 1999-10-24 02:13:29.000000000 -0400 -+++ cftypes.h 2014-02-21 15:42:11.491293648 -0500 +--- cftypes.h.orig 1999-10-24 06:13:29 UTC ++++ cftypes.h @@ -16,7 +16,10 @@ #ifndef __CFTYPES_H__ #define __CFTYPES_H__ diff --git a/archivers/libcabinet/files/patch-darray.h b/archivers/libcabinet/files/patch-darray.h index 2e28f3f879f1..3687c2748494 100644 --- a/archivers/libcabinet/files/patch-darray.h +++ b/archivers/libcabinet/files/patch-darray.h @@ -1,6 +1,6 @@ ---- darray.h.orig Sun Aug 31 05:55:31 2003 -+++ darray.h Sun Aug 31 05:55:32 2003 -@@ -155,4 +155,4 @@ +--- darray.h.orig 1999-10-24 11:29:53 UTC ++++ darray.h +@@ -155,4 +155,4 @@ void dynamic_array::reset(si ///////////////////////////////////////*************************************** diff --git a/archivers/libcabinet/files/patch-listcab.cpp b/archivers/libcabinet/files/patch-listcab.cpp index b8c491785904..c46f051b7ae8 100644 --- a/archivers/libcabinet/files/patch-listcab.cpp +++ b/archivers/libcabinet/files/patch-listcab.cpp @@ -1,5 +1,5 @@ ---- listcab.cpp.orig 1999-10-24 08:11:38.000000000 -0400 -+++ listcab.cpp 2014-02-21 16:14:29.246853465 -0500 +--- listcab.cpp.orig 1999-10-24 12:11:38 UTC ++++ listcab.cpp @@ -8,8 +8,8 @@ #include #include @@ -22,7 +22,7 @@ ////////////////////////////////////////**************************************** void display_header_info(cabinet_header& cfh); -@@ -47,13 +51,19 @@ +@@ -47,13 +51,19 @@ int main(int argc, char *argv[]) cerr << "New Folder Error: " << retval << endl; return 1; } @@ -46,7 +46,7 @@ if((retval = cab.add_file(filename)) != OK) { perror("read"); -@@ -62,10 +72,13 @@ +@@ -62,10 +72,13 @@ int main(int argc, char *argv[]) return 1; } } diff --git a/archivers/libcomprex/files/patch-configure b/archivers/libcomprex/files/patch-configure index e89ad6403c2e..1e0f894717fc 100644 --- a/archivers/libcomprex/files/patch-configure +++ b/archivers/libcomprex/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2003-03-06 07:31:05.000000000 +0300 -+++ configure 2009-11-04 07:04:24.000000000 +0300 -@@ -9263,7 +9263,7 @@ +--- configure.orig 2003-03-06 04:31:05 UTC ++++ configure +@@ -9263,7 +9263,7 @@ if test "x$static_scheme_curl" = "xyes"; extern_scheme_init="$extern_scheme_init CxSchemeOps *init_curl_scheme_module(void);" load_scheme_mod="$load_scheme_mod init_curl_scheme_module();" else diff --git a/archivers/libcomprex/files/patch-header.c b/archivers/libcomprex/files/patch-modules_archive_zip_header.c similarity index 56% rename from archivers/libcomprex/files/patch-header.c rename to archivers/libcomprex/files/patch-modules_archive_zip_header.c index 5a6fd4b4c673..f138702ea211 100644 --- a/archivers/libcomprex/files/patch-header.c +++ b/archivers/libcomprex/files/patch-modules_archive_zip_header.c @@ -1,5 +1,5 @@ ---- modules/archive/zip/header.c.orig Sun Aug 15 18:08:32 2004 -+++ modules/archive/zip/header.c Sun Aug 15 18:08:34 2004 +--- modules/archive/zip/header.c.orig 2003-01-01 06:22:34 UTC ++++ modules/archive/zip/header.c @@ -25,7 +25,7 @@ #include "zip.h" diff --git a/archivers/libcomprex/files/patch-tests__extractarchive.c b/archivers/libcomprex/files/patch-tests__extractarchive.c index 559dcb67af68..8cf7bd09640a 100644 --- a/archivers/libcomprex/files/patch-tests__extractarchive.c +++ b/archivers/libcomprex/files/patch-tests__extractarchive.c @@ -1,5 +1,5 @@ ---- tests/extractarchive.c.orig Fri Dec 20 08:03:40 2002 -+++ tests/extractarchive.c Mon Jun 23 13:16:14 2003 +--- tests/extractarchive.c.orig 2002-12-19 23:03:40 UTC ++++ tests/extractarchive.c @@ -37,7 +37,9 @@ void __extractprogress(CxArchive *archive, CxFile *file, size_t onFile, size_t fileCount) diff --git a/archivers/liblzxcomp/files/patch-lz_nonslide.c b/archivers/liblzxcomp/files/patch-lz__nonslide.c similarity index 79% rename from archivers/liblzxcomp/files/patch-lz_nonslide.c rename to archivers/liblzxcomp/files/patch-lz__nonslide.c index 339cb29f2737..a44a9f2b67c2 100644 --- a/archivers/liblzxcomp/files/patch-lz_nonslide.c +++ b/archivers/liblzxcomp/files/patch-lz__nonslide.c @@ -1,4 +1,5 @@ -Index: lz_nonslide.c +--- lz_nonslide.c.orig 2005-07-06 02:17:46 UTC ++++ lz_nonslide.c @@ -19,10 +19,11 @@ /* * Document here diff --git a/archivers/liborange/files/patch-inno.h b/archivers/liborange/files/patch-lib_inno.h similarity index 86% rename from archivers/liborange/files/patch-inno.h rename to archivers/liborange/files/patch-lib_inno.h index e34969a54f5e..c9e262e5258e 100644 --- a/archivers/liborange/files/patch-inno.h +++ b/archivers/liborange/files/patch-lib_inno.h @@ -1,5 +1,5 @@ ---- lib/inno.h.orig 2008-05-22 15:55:23.000000000 +1000 -+++ lib/inno.h 2008-05-22 15:57:49.000000000 +1000 +--- lib/inno.h.orig 2007-11-29 13:50:20 UTC ++++ lib/inno.h @@ -3,7 +3,7 @@ #define __inno_h__ @@ -9,7 +9,7 @@ #include #include -@@ -99,7 +99,7 @@ +@@ -99,7 +99,7 @@ typedef struct uint32_t NumUninstallDeleteEntries; uint32_t NumRunEntries; uint32_t NumUninstallRunEntries; @@ -18,7 +18,7 @@ } TSetupHeader; #define SETUP_HEADER_SIZE 0xd9 -@@ -143,9 +143,9 @@ +@@ -143,9 +143,9 @@ typedef enum typedef struct { @@ -31,7 +31,7 @@ } TSetupVersionData; #if 0 -@@ -172,12 +172,12 @@ +@@ -172,12 +172,12 @@ typedef struct char* InstallFontName; char* Components; char* Tasks; diff --git a/archivers/libunrar/files/patch-dll.cpp b/archivers/libunrar/files/patch-dll.cpp index a09c78f074f9..1751b68cd735 100644 --- a/archivers/libunrar/files/patch-dll.cpp +++ b/archivers/libunrar/files/patch-dll.cpp @@ -1,6 +1,6 @@ -diff -ruN unrar.orig/dll.cpp unrar/dll.cpp +--- dll.cpp.orig 2010-03-15 06:30:52 UTC +++ dll.cpp -@@ -272,7 +272,9 @@ +@@ -281,7 +281,9 @@ int PASCAL ProcessFile(HANDLE hArcData,i strcpy(Data->Cmd.Command,Operation==RAR_EXTRACT ? "X":"T"); Data->Cmd.Test=Operation!=RAR_EXTRACT; bool Repeat=false; diff --git a/archivers/libunrar/files/patch-dll.hpp b/archivers/libunrar/files/patch-dll.hpp index d78aea5bb571..9a075eb41c89 100644 --- a/archivers/libunrar/files/patch-dll.hpp +++ b/archivers/libunrar/files/patch-dll.hpp @@ -1,5 +1,5 @@ ---- dll.hpp 2008-11-06 01:37:37.000000000 +0100 -+++ dll.hpp 2008-11-06 01:38:47.000000000 +0100 +--- dll.hpp.orig 2010-03-15 06:30:53 UTC ++++ dll.hpp @@ -28,14 +28,14 @@ #define RAR_DLL_VERSION 4 diff --git a/archivers/libunrar/files/patch-extract.cpp b/archivers/libunrar/files/patch-extract.cpp index d52b2842361f..3343c6255c49 100644 --- a/archivers/libunrar/files/patch-extract.cpp +++ b/archivers/libunrar/files/patch-extract.cpp @@ -1,6 +1,6 @@ ---- extract.cpp.orig 2009-06-30 09:18:53.000000000 +0300 -+++ extract.cpp 2009-07-09 10:02:21.000000000 +0300 -@@ -354,6 +354,7 @@ +--- extract.cpp.orig 2010-03-15 06:30:52 UTC ++++ extract.cpp +@@ -354,6 +354,7 @@ bool CmdExtract::ExtractCurrentFile(Comm char CurVolName[NM]; strcpy(CurVolName,ArcName); diff --git a/archivers/libunrar/files/patch-makefile.unix b/archivers/libunrar/files/patch-makefile.unix index 436368432457..66ff4e0854db 100644 --- a/archivers/libunrar/files/patch-makefile.unix +++ b/archivers/libunrar/files/patch-makefile.unix @@ -1,5 +1,5 @@ ---- makefile.unix.orig 2008-10-09 15:43:06.000000000 +0200 -+++ makefile.unix 2008-11-06 01:43:52.000000000 +0100 +--- makefile.unix.orig 2009-05-03 05:18:45 UTC ++++ makefile.unix @@ -7,10 +7,11 @@ # Linux using GCC @@ -14,16 +14,16 @@ # Linux using LCC #CXX=lcc -@@ -100,7 +101,7 @@ +@@ -100,7 +101,7 @@ LINK=$(CXX) WHAT=UNRAR UNRAR_OBJ=filestr.o recvol.o rs.o scantree.o -LIB_OBJ=filestr.o scantree.o dll.o +LIB_OBJ=dll.o - OBJECTS=rar.o strlist.o strfn.o pathfn.o int64.o savepos.o global.o file.o filefn.o filcreat.o \ + OBJECTS=rar.o strlist.o strfn.o pathfn.o savepos.o smallfn.o global.o file.o filefn.o filcreat.o \ archive.o arcread.o unicode.o system.o isnt.o crypt.o crc.o rawread.o encname.o \ -@@ -131,9 +132,15 @@ +@@ -131,9 +132,15 @@ sfx: $(OBJECTS) $(STRIP) default.sfx lib: WHAT=RARDLL diff --git a/archivers/libzip/files/patch-lib__Makefile.in b/archivers/libzip/files/patch-lib__Makefile.in index cd4d7ffaad5d..eaebfcc94cc3 100644 --- a/archivers/libzip/files/patch-lib__Makefile.in +++ b/archivers/libzip/files/patch-lib__Makefile.in @@ -1,6 +1,6 @@ ---- lib/Makefile.in.orig 2015-08-26 18:39:20 UTC +--- lib/Makefile.in.orig 2016-02-19 14:21:44 UTC +++ lib/Makefile.in -@@ -355,8 +355,8 @@ AM_CFLAGS = @CFLAG_VISIBILITY@ +@@ -367,8 +367,8 @@ AM_CFLAGS = @CFLAG_VISIBILITY@ libincludedir = ${libdir}/@PACKAGE@/include lib_LTLIBRARIES = libzip.la noinst_HEADERS = zipint.h @@ -11,7 +11,7 @@ # also update CMakeLists.txt when changing version libzip_la_LDFLAGS = -no-undefined -version-info 4:0:0 -@@ -869,8 +869,7 @@ info: info-am +@@ -882,8 +882,7 @@ info: info-am info-am: diff --git a/archivers/libzip/files/patch-libzip.pc.in b/archivers/libzip/files/patch-libzip.pc.in index 4c6607709e47..7a9a58210a00 100644 --- a/archivers/libzip/files/patch-libzip.pc.in +++ b/archivers/libzip/files/patch-libzip.pc.in @@ -1,4 +1,4 @@ ---- libzip.pc.in.orig 2014-03-08 20:13:21 UTC +--- libzip.pc.in.orig 2014-08-12 12:48:41 UTC +++ libzip.pc.in @@ -2,7 +2,6 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ diff --git a/archivers/lrzip/files/patch-lrzip__private.h b/archivers/lrzip/files/patch-lrzip__private.h index 0d0a20e66993..6cbd129a04e5 100644 --- a/archivers/lrzip/files/patch-lrzip__private.h +++ b/archivers/lrzip/files/patch-lrzip__private.h @@ -1,4 +1,4 @@ ---- lrzip_private.h.orig 2015-03-10 09:25:42 UTC +--- lrzip_private.h.orig 2016-06-09 05:01:44 UTC +++ lrzip_private.h @@ -47,7 +47,7 @@ #ifdef HAVE_ALLOCA_H diff --git a/archivers/lzo2/files/patch-include__lzo__lzodefs.h b/archivers/lzo2/files/patch-include__lzo__lzodefs.h index f72388541adc..b836430e338a 100644 --- a/archivers/lzo2/files/patch-include__lzo__lzodefs.h +++ b/archivers/lzo2/files/patch-include__lzo__lzodefs.h @@ -1,5 +1,5 @@ ---- ./include/lzo/lzodefs.h.orig 2014-06-25 15:47:13.000000000 +0200 -+++ ./include/lzo/lzodefs.h 2014-06-27 06:31:33.000000000 +0200 +--- include/lzo/lzodefs.h.orig 2015-02-04 11:24:51 UTC ++++ include/lzo/lzodefs.h @@ -29,6 +29,8 @@ #ifndef __LZODEFS_H_INCLUDED #define __LZODEFS_H_INCLUDED 1 diff --git a/archivers/macutils/files/patch-crc_makefile b/archivers/macutils/files/patch-crc_makefile index c053bcbb1716..aa88fd6aa67e 100644 --- a/archivers/macutils/files/patch-crc_makefile +++ b/archivers/macutils/files/patch-crc_makefile @@ -1,12 +1,12 @@ ---- crc/makefile.orig Sun Oct 19 01:17:42 2003 -+++ crc/makefile Sun Oct 19 01:18:15 2003 +--- crc/makefile.orig 1993-10-02 20:16:00 UTC ++++ crc/makefile @@ -1,4 +1,4 @@ -CFLAGS = -O $(CF) +CFLAGS += $(CF) CRCC = arc.c ccitt.c kermit.c binhex.c ccitt32.c zip.c CRCO = arc.o ccitt.o kermit.o binhex.o ccitt32.o zip.o -@@ -16,7 +16,7 @@ +@@ -16,7 +16,7 @@ $(CRCC): makecrc ./makecrc makecrc: makecrc.o diff --git a/archivers/macutils/files/patch-hexbin_globals.h b/archivers/macutils/files/patch-hexbin_globals.h index b5ec39483f06..7fb9c127602e 100644 --- a/archivers/macutils/files/patch-hexbin_globals.h +++ b/archivers/macutils/files/patch-hexbin_globals.h @@ -1,6 +1,6 @@ ---- hexbin/globals.h.orig Fri Apr 16 00:28:16 1999 -+++ hexbin/globals.h Fri Apr 16 00:28:25 1999 -@@ -13,7 +13,7 @@ +--- hexbin/globals.h.orig 1993-10-02 20:16:00 UTC ++++ hexbin/globals.h +@@ -13,7 +13,7 @@ extern void transname(); extern char info[]; extern char trname[]; diff --git a/archivers/macutils/files/patch-macunpack_cpt.h b/archivers/macutils/files/patch-macunpack_cpt.h index 0fbd808f7db8..94a77a576eed 100644 --- a/archivers/macutils/files/patch-macunpack_cpt.h +++ b/archivers/macutils/files/patch-macunpack_cpt.h @@ -1,5 +1,5 @@ ---- macunpack/cpt.h.orig Fri Apr 16 00:31:28 1999 -+++ macunpack/cpt.h Fri Apr 16 00:32:07 1999 +--- macunpack/cpt.h.orig 1993-10-02 20:16:00 UTC ++++ macunpack/cpt.h @@ -31,7 +31,7 @@ typedef long OSType; @@ -9,7 +9,7 @@ unsigned char signature; /* = 1 -- for verification */ unsigned char volume; /* for multi-file archives */ unsigned short xmagic; /* verification multi-file consistency*/ -@@ -42,7 +42,7 @@ +@@ -42,7 +42,7 @@ typedef struct cptHdr { /* 8 bytes */ unsigned char commentsize; /* number of bytes comment that follow*/ }; diff --git a/archivers/macutils/files/patch-macunpack_dd.c b/archivers/macutils/files/patch-macunpack_dd.c index 83ae8b721f64..953e85584db3 100644 --- a/archivers/macutils/files/patch-macunpack_dd.c +++ b/archivers/macutils/files/patch-macunpack_dd.c @@ -1,6 +1,6 @@ ---- macunpack/dd.c.orig Fri Apr 16 00:26:39 1999 -+++ macunpack/dd.c Fri Apr 16 00:26:45 1999 -@@ -45,7 +45,7 @@ +--- macunpack/dd.c.orig 1993-10-02 20:16:00 UTC ++++ macunpack/dd.c +@@ -45,7 +45,7 @@ static int dd_getbits(); #endif /* UNTESTED */ static void dd_cpt_compat(); diff --git a/archivers/macutils/files/patch-macunpack_dd.h b/archivers/macutils/files/patch-macunpack_dd.h index 1e60f45f1515..dff85ca8f99d 100644 --- a/archivers/macutils/files/patch-macunpack_dd.h +++ b/archivers/macutils/files/patch-macunpack_dd.h @@ -1,5 +1,5 @@ ---- macunpack/dd.h.orig Fri Apr 16 00:25:41 1999 -+++ macunpack/dd.h Fri Apr 16 00:25:55 1999 +--- macunpack/dd.h.orig 1993-10-02 20:16:00 UTC ++++ macunpack/dd.h @@ -52,7 +52,7 @@ typedef long OSType; @@ -9,7 +9,7 @@ unsigned char magic[4]; /* "DDAR" */ unsigned char fill1[4]; /* ??? */ unsigned char fName[64]; /* a STR63 */ -@@ -73,7 +73,7 @@ +@@ -73,7 +73,7 @@ typedef struct fileHdr { /* 124 bytes * unsigned short hdrcrc; /* true crc */ }; diff --git a/archivers/macutils/files/patch-macunpack_jdw.h b/archivers/macutils/files/patch-macunpack_jdw.h index 4eca92c2636b..8699e8fd2e26 100644 --- a/archivers/macutils/files/patch-macunpack_jdw.h +++ b/archivers/macutils/files/patch-macunpack_jdw.h @@ -1,5 +1,5 @@ ---- macunpack/jdw.h.orig Fri Apr 16 00:13:34 1999 -+++ macunpack/jdw.h Fri Apr 16 00:13:37 1999 +--- macunpack/jdw.h.orig 1993-10-02 20:16:00 UTC ++++ macunpack/jdw.h @@ -8,7 +8,7 @@ #define J_MTIME 34 #define J_FLENGTH 38 diff --git a/archivers/macutils/files/patch-macunpack_lzc.h b/archivers/macutils/files/patch-macunpack_lzc.h index d68cac214f63..2141a2a8e85c 100644 --- a/archivers/macutils/files/patch-macunpack_lzc.h +++ b/archivers/macutils/files/patch-macunpack_lzc.h @@ -1,5 +1,5 @@ ---- macunpack/lzc.h.orig Fri Apr 16 00:29:28 1999 -+++ macunpack/lzc.h Fri Apr 16 00:29:36 1999 +--- macunpack/lzc.h.orig 1993-10-02 20:16:00 UTC ++++ macunpack/lzc.h @@ -12,7 +12,7 @@ #define C_AUTHOFF 36 #define C_FLAGOFF 40 diff --git a/archivers/macutils/files/patch-macunpack_lzh.c b/archivers/macutils/files/patch-macunpack_lzh.c index d52b1ed742e7..95db98290162 100644 --- a/archivers/macutils/files/patch-macunpack_lzh.c +++ b/archivers/macutils/files/patch-macunpack_lzh.c @@ -1,6 +1,6 @@ ---- macunpack/lzh.c.orig 2014-07-27 11:11:36.000000000 -0400 -+++ macunpack/lzh.c 2014-07-27 11:11:39.000000000 -0400 -@@ -23,7 +23,7 @@ +--- macunpack/lzh.c.orig 1993-10-02 20:16:00 UTC ++++ macunpack/lzh.c +@@ -23,7 +23,7 @@ extern void de_lzah(); extern unsigned char (*lzah_getbyte)(); extern void de_lzh(); @@ -9,7 +9,7 @@ char *name; int number; }; -@@ -40,13 +40,13 @@ +@@ -40,13 +40,13 @@ static struct methodinfo methods[] = { {"-lzs-", lzs} }; static char *lzh_archive; diff --git a/archivers/macutils/files/patch-macunpack_lzh.h b/archivers/macutils/files/patch-macunpack_lzh.h index 902138b785ff..bdd51ad9da3c 100644 --- a/archivers/macutils/files/patch-macunpack_lzh.h +++ b/archivers/macutils/files/patch-macunpack_lzh.h @@ -1,5 +1,5 @@ ---- macunpack/lzh.h.orig Fri Apr 16 00:24:44 1999 -+++ macunpack/lzh.h Fri Apr 16 00:24:58 1999 +--- macunpack/lzh.h.orig 1993-10-02 20:16:00 UTC ++++ macunpack/lzh.h @@ -30,7 +30,7 @@ #define L_EEXTENDSZ 0 #define L_EEXTEND 1 diff --git a/archivers/macutils/files/patch-macunpack_sit.c b/archivers/macutils/files/patch-macunpack_sit.c index b5574ae7b748..c1000b9a779f 100644 --- a/archivers/macutils/files/patch-macunpack_sit.c +++ b/archivers/macutils/files/patch-macunpack_sit.c @@ -1,6 +1,6 @@ ---- macunpack/sit.c.orig Fri Apr 16 00:18:28 1999 -+++ macunpack/sit.c Fri Apr 16 00:18:34 1999 -@@ -19,7 +19,7 @@ +--- macunpack/sit.c.orig 1993-10-02 20:16:00 UTC ++++ macunpack/sit.c +@@ -19,7 +19,7 @@ extern void set_huffman(); extern void de_lzah(); extern unsigned char (*lzah_getbyte)(); diff --git a/archivers/macutils/files/patch-macunpack_sit.h b/archivers/macutils/files/patch-macunpack_sit.h index 8cfc5459da91..fcf1f0878ae9 100644 --- a/archivers/macutils/files/patch-macunpack_sit.h +++ b/archivers/macutils/files/patch-macunpack_sit.h @@ -1,5 +1,5 @@ ---- macunpack/sit.h.orig Fri Apr 16 00:15:41 1999 -+++ macunpack/sit.h Fri Apr 16 00:15:56 1999 +--- macunpack/sit.h.orig 1993-10-02 20:16:00 UTC ++++ macunpack/sit.h @@ -24,7 +24,7 @@ typedef long OSType; @@ -9,7 +9,7 @@ OSType signature; /* = 'SIT!' -- for verification */ unsigned short numFiles; /* number of files in archive */ unsigned long arcLength; /* length of entire archive incl. -@@ -34,7 +34,7 @@ +@@ -34,7 +34,7 @@ typedef struct sitHdr { /* 22 bytes */ char reserved[7]; }; diff --git a/archivers/macutils/files/patch-macunpack_stf.h b/archivers/macutils/files/patch-macunpack_stf.h index 20c7d02dea73..19f4404b2506 100644 --- a/archivers/macutils/files/patch-macunpack_stf.h +++ b/archivers/macutils/files/patch-macunpack_stf.h @@ -1,5 +1,5 @@ ---- macunpack/stf.h.orig Fri Apr 16 00:22:12 1999 -+++ macunpack/stf.h Fri Apr 16 00:22:19 1999 +--- macunpack/stf.h.orig 1993-10-02 20:16:00 UTC ++++ macunpack/stf.h @@ -5,7 +5,7 @@ #define S_RSRCLNGTH 3 /* + NAMELENGTH */ #define S_DATALNGTH 7 /* + NAMELENGTH */ diff --git a/archivers/macutils/files/patch-macunpack_zma.h b/archivers/macutils/files/patch-macunpack_zma.h index 6dac05bda456..05db6614ef29 100644 --- a/archivers/macutils/files/patch-macunpack_zma.h +++ b/archivers/macutils/files/patch-macunpack_zma.h @@ -1,5 +1,5 @@ ---- macunpack/zma.h.orig Fri Apr 16 01:04:19 1999 -+++ macunpack/zma.h Fri Apr 16 01:04:29 1999 +--- macunpack/zma.h.orig 1993-10-02 20:16:00 UTC ++++ macunpack/zma.h @@ -20,7 +20,7 @@ #define Z_RCRC 44 /* Resource crc */ #define Z_FNAME 46 /* File name length and name */ diff --git a/archivers/macutils/files/patch-makefile b/archivers/macutils/files/patch-makefile index 080da53c7ae2..0c381564f8d5 100644 --- a/archivers/macutils/files/patch-makefile +++ b/archivers/macutils/files/patch-makefile @@ -1,12 +1,12 @@ ---- makefile.orig Sun Oct 3 05:16:00 1993 -+++ makefile Sat Jun 10 13:35:16 2000 +--- makefile.orig 1993-10-02 20:16:00 UTC ++++ makefile @@ -1,5 +1,4 @@ SHELL = /bin/sh -BINDIR = /ufs/dik/tmpbin # Use the following flags on the CF macro definition as needed. # # -DBSD if you are on a BSD system -@@ -24,44 +23,44 @@ +@@ -24,44 +23,44 @@ BINDIR = /ufs/dik/tmpbin # # -DAPPLEDOUBLE if you want to be able to use an AppleDouble file system # diff --git a/archivers/macutils/files/patch-util_transname.c b/archivers/macutils/files/patch-util_transname.c index 325ecdab60bd..22d615288a20 100644 --- a/archivers/macutils/files/patch-util_transname.c +++ b/archivers/macutils/files/patch-util_transname.c @@ -1,5 +1,5 @@ ---- util/transname.c.orig Fri Apr 16 00:02:36 1999 -+++ util/transname.c Fri Apr 16 00:02:38 1999 +--- util/transname.c.orig 1993-10-02 20:16:00 UTC ++++ util/transname.c @@ -1,5 +1,5 @@ #include -#include diff --git a/archivers/mscompress/files/patch-mscompress.c b/archivers/mscompress/files/patch-mscompress.c index 5184992ab5dc..6b2181be9ac9 100644 --- a/archivers/mscompress/files/patch-mscompress.c +++ b/archivers/mscompress/files/patch-mscompress.c @@ -1,5 +1,5 @@ ---- mscompress.c.orig 2011-12-22 00:20:22.000000000 +0800 -+++ mscompress.c 2011-12-22 00:20:29.000000000 +0800 +--- mscompress.c.orig 2000-04-15 13:15:38 UTC ++++ mscompress.c @@ -306,7 +306,7 @@ usage (char *progname) exit (0); } diff --git a/archivers/mscompress/files/patch-msexpand.c b/archivers/mscompress/files/patch-msexpand.c index fe4eb61de5aa..781a778fd7c4 100644 --- a/archivers/mscompress/files/patch-msexpand.c +++ b/archivers/mscompress/files/patch-msexpand.c @@ -1,5 +1,5 @@ ---- msexpand.c.orig 2011-12-22 00:20:38.000000000 +0800 -+++ msexpand.c 2011-12-22 00:20:44.000000000 +0800 +--- msexpand.c.orig 2000-04-15 13:15:45 UTC ++++ msexpand.c @@ -215,7 +215,7 @@ usage (char *progname) exit (0); } diff --git a/archivers/p5-Compress-LZO/files/patch-Makefile.PL b/archivers/p5-Compress-LZO/files/patch-Makefile.PL index 058110fee105..e96c66e5cf58 100644 --- a/archivers/p5-Compress-LZO/files/patch-Makefile.PL +++ b/archivers/p5-Compress-LZO/files/patch-Makefile.PL @@ -1,6 +1,6 @@ ---- Makefile.PL.orig 1998-08-23 18:14:41.000000000 +0800 -+++ Makefile.PL 2011-12-06 09:11:59.832206442 +0800 -@@ -14,6 +14,8 @@ +--- Makefile.PL.orig 1998-08-23 10:14:41 UTC ++++ Makefile.PL +@@ -14,6 +14,8 @@ use Config; # installed. #$LZO_LIB = '-L/usr/local/lib'; @@ -9,7 +9,7 @@ # It shouldn't be necessary to change anything from here on. -@@ -21,7 +23,7 @@ +@@ -21,7 +23,7 @@ use Config; WriteMakefile( NAME => 'Compress::LZO', VERSION_FROM => 'LZO.pm', diff --git a/archivers/p5-IO-Zlib/files/patch-Zlib.pm b/archivers/p5-IO-Zlib/files/patch-Zlib.pm index 0fa9323ccb77..4ff6310c14c7 100644 --- a/archivers/p5-IO-Zlib/files/patch-Zlib.pm +++ b/archivers/p5-IO-Zlib/files/patch-Zlib.pm @@ -1,6 +1,6 @@ ---- Zlib.pm.orig Sun Feb 13 00:43:08 2005 -+++ Zlib.pm Sun Feb 13 00:43:30 2005 -@@ -297,7 +297,7 @@ +--- Zlib.pm.orig 2009-07-14 21:30:41 UTC ++++ Zlib.pm +@@ -289,7 +289,7 @@ use strict; use vars qw($VERSION $AUTOLOAD @ISA); use Carp; diff --git a/archivers/p7zip/files/patch-CPP_7zip_Archive_HfsHandler.cpp b/archivers/p7zip/files/patch-CPP_7zip_Archive_HfsHandler.cpp index 2ff5cd79e848..e01719cb0514 100644 --- a/archivers/p7zip/files/patch-CPP_7zip_Archive_HfsHandler.cpp +++ b/archivers/p7zip/files/patch-CPP_7zip_Archive_HfsHandler.cpp @@ -1,9 +1,9 @@ Patch for CVE-2016-2334. Obtained from: https://sourceforge.net/p/p7zip/discussion/383043/thread/9d0fb86b/ ---- CPP/7zip/Archive/HfsHandler.cpp.orig Fri Jun 19 06:52:08 2015 -+++ CPP/7zip/Archive/HfsHandler.cpp Mon May 23 20:37:42 2016 -@@ -987,7 +987,9 @@ HRESULT CDatabase::LoadCatalog(const CFork &fork, cons +--- CPP/7zip/Archive/HfsHandler.cpp.orig 2015-06-19 10:52:08 UTC ++++ CPP/7zip/Archive/HfsHandler.cpp +@@ -987,7 +987,9 @@ HRESULT CDatabase::LoadCatalog(const CFo item.GroupID = Get32(r + 0x24); item.AdminFlags = r[0x28]; item.OwnerFlags = r[0x29]; @@ -13,13 +13,13 @@ Obtained from: https://sourceforge.net/p/p7zip/discussion/383043/thread/9d0fb86b item.special.iNodeNum = Get16(r + 0x2C); // or .linkCount item.FileType = Get32(r + 0x30); item.FileCreator = Get32(r + 0x34); -@@ -1571,6 +1573,9 @@ HRESULT CHandler::ExtractZlibFile( - blockSize = (UInt32)rem; +@@ -1572,6 +1574,9 @@ HRESULT CHandler::ExtractZlibFile( UInt32 size = GetUi32(tableBuf + i * 8 + 4); -+ + + if (size > buf.Size() || size > kCompressionBlockSize + 1) + return S_FALSE; - ++ RINOK(ReadStream_FALSE(inStream, buf, size)); + if ((buf[0] & 0xF) == 0xF) diff --git a/archivers/p7zip/files/patch-CPP_7zip_Archive_Udf_UdfIn.cpp b/archivers/p7zip/files/patch-CPP_7zip_Archive_Udf_UdfIn.cpp index 54c50066a2ef..a8e754d18f17 100644 --- a/archivers/p7zip/files/patch-CPP_7zip_Archive_Udf_UdfIn.cpp +++ b/archivers/p7zip/files/patch-CPP_7zip_Archive_Udf_UdfIn.cpp @@ -1,9 +1,9 @@ Patch for CVE-2016-2335. Obtained from: https://sourceforge.net/p/p7zip/discussion/383043/thread/9d0fb86b/ ---- CPP/7zip/Archive/Udf/UdfIn.cpp.orig Fri Nov 20 15:40:08 2015 -+++ CPP/7zip/Archive/Udf/UdfIn.cpp Mon May 23 20:37:46 2016 -@@ -389,7 +389,11 @@ HRESULT CInArchive::ReadFileItem(int volIndex, int fsI +--- CPP/7zip/Archive/Udf/UdfIn.cpp.orig 2015-11-20 20:40:08 UTC ++++ CPP/7zip/Archive/Udf/UdfIn.cpp +@@ -389,7 +389,11 @@ HRESULT CInArchive::ReadFileItem(int vol return S_FALSE; CFile &file = Files.Back(); const CLogVol &vol = LogVols[volIndex]; diff --git a/archivers/p7zip/files/patch-CPP-Windows-System.cpp b/archivers/p7zip/files/patch-CPP_Windows_System.cpp similarity index 85% rename from archivers/p7zip/files/patch-CPP-Windows-System.cpp rename to archivers/p7zip/files/patch-CPP_Windows_System.cpp index 467aceaccba2..4214f0888b95 100644 --- a/archivers/p7zip/files/patch-CPP-Windows-System.cpp +++ b/archivers/p7zip/files/patch-CPP_Windows_System.cpp @@ -1,4 +1,4 @@ ---- CPP/Windows/System.cpp.orig 2015-09-26 08:47:01 UTC +--- CPP/Windows/System.cpp.orig 2015-11-20 21:33:04 UTC +++ CPP/Windows/System.cpp @@ -44,7 +44,7 @@ namespace NWindows #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) diff --git a/archivers/packddir/files/patch-upackddir.c b/archivers/packddir/files/patch-upackddir.c index 64a51e301916..8972f60fa251 100644 --- a/archivers/packddir/files/patch-upackddir.c +++ b/archivers/packddir/files/patch-upackddir.c @@ -1,6 +1,6 @@ ---- upackddir.c.orig 2009-08-22 04:48:16.000000000 +0900 -+++ upackddir.c 2009-08-22 04:48:39.000000000 +0900 -@@ -253,7 +253,7 @@ +--- upackddir.c.orig 2004-01-17 12:08:52 UTC ++++ upackddir.c +@@ -253,7 +253,7 @@ int packfile_extract(char *packfile, int } /* Let's jump to the beginning of our sweet data */ @@ -9,7 +9,7 @@ for (i = 0; i < pack->numfiles; i++) { fprintf(stderr, "%s\n", mapped->name); -@@ -297,7 +297,7 @@ +@@ -297,7 +297,7 @@ int packfile_extract_filename(char *pack } /* Let's jump to the beginning of our sweet data */ diff --git a/archivers/paq/files/patch-zpaq.cpp b/archivers/paq/files/patch-zpaq.cpp index 4b39843d73af..56b513320dc4 100644 --- a/archivers/paq/files/patch-zpaq.cpp +++ b/archivers/paq/files/patch-zpaq.cpp @@ -1,6 +1,6 @@ ---- zpaq.cpp.orig 2013-02-07 12:39:36.000000000 -0500 -+++ zpaq.cpp 2013-02-07 12:39:51.000000000 -0500 -@@ -1089,24 +1089,7 @@ +--- zpaq.cpp.orig 2016-07-26 12:11:37 UTC ++++ zpaq.cpp +@@ -1236,24 +1236,7 @@ int numberOfProcessors() { int rc=0; // result #ifdef unix diff --git a/archivers/paq/files/patch_zpsfx.cpp b/archivers/paq/files/patch_zpsfx.cpp index a23211719c1c..5f6031b53128 100644 --- a/archivers/paq/files/patch_zpsfx.cpp +++ b/archivers/paq/files/patch_zpsfx.cpp @@ -1,6 +1,6 @@ ---- zpsfx.cpp.orig 2012-04-09 04:01:23.000000000 -0400 -+++ zpsfx.cpp 2012-04-09 04:02:25.000000000 -0400 -@@ -16,19 +16,38 @@ +--- zpsfx.cpp.orig 2016-07-26 12:10:41 UTC ++++ zpsfx.cpp +@@ -16,19 +16,38 @@ Or use appropriate optimization options. the executable smaller. -DNDEBUG turns off run time checks. To convert a ZPAQ archive to a self extracting archive: @@ -39,7 +39,7 @@ The program reads itself and decompresses the appended archive. You must enter the .exe extension as shown. If the file is not in the current folder then you need to specify the path. The PATH environment -@@ -44,7 +63,11 @@ +@@ -44,7 +63,11 @@ stored filename. SHA-1 checksums are not #include #include #include @@ -51,7 +51,7 @@ // An error handler is required as shown in this example. libzpaq will // call it with an English language message in case of a fatal error. -@@ -96,7 +119,11 @@ +@@ -96,7 +119,11 @@ struct Buf: public libzpaq::Writer { // Return '/' in Linux or '\' in Windows char slash() { @@ -63,7 +63,7 @@ } // Create directories as needed. For example if path="/tmp/foo/bar" -@@ -106,7 +133,11 @@ +@@ -106,7 +133,11 @@ void makepath(std::string& path) { for (int i=0; i #include #include diff --git a/archivers/par2cmdline/files/patch-par2creatorsourcefile.cpp b/archivers/par2cmdline/files/patch-par2creatorsourcefile.cpp index b275a374dfb6..60de68ab300e 100644 --- a/archivers/par2cmdline/files/patch-par2creatorsourcefile.cpp +++ b/archivers/par2cmdline/files/patch-par2creatorsourcefile.cpp @@ -1,6 +1,6 @@ ---- par2creatorsourcefile.cpp.orig 2009-03-10 07:10:35.860499029 +0000 -+++ par2creatorsourcefile.cpp 2009-03-10 07:12:53.111712521 +0000 -@@ -224,6 +224,10 @@ +--- par2creatorsourcefile.cpp.orig 2004-04-15 13:45:23 UTC ++++ par2creatorsourcefile.cpp +@@ -224,6 +224,10 @@ bool Par2CreatorSourceFile::Open(Command cout << newfraction/10 << '.' << newfraction%10 << "%\r" << flush; } } diff --git a/archivers/par2cmdline/files/patch-par2fileformat.h b/archivers/par2cmdline/files/patch-par2fileformat.h index 8b2a7642cddf..b89635e08205 100644 --- a/archivers/par2cmdline/files/patch-par2fileformat.h +++ b/archivers/par2cmdline/files/patch-par2fileformat.h @@ -1,6 +1,6 @@ ---- par2fileformat.h.orig 2011-06-23 08:31:37.639455018 +0200 -+++ par2fileformat.h 2011-06-23 08:38:29.287362503 +0200 -@@ -84,7 +84,7 @@ +--- par2fileformat.h.orig 2003-08-01 23:43:40 UTC ++++ par2fileformat.h +@@ -84,7 +84,7 @@ struct FILEVERIFICATIONPACKET PACKET_HEADER header; // Body MD5Hash fileid; // MD5hash of file_hash_16k, file_length, file_name diff --git a/archivers/par2cmdline/files/patch-reedsolomon.cpp b/archivers/par2cmdline/files/patch-reedsolomon.cpp index 279479af1dc5..8738aec6479a 100644 --- a/archivers/par2cmdline/files/patch-reedsolomon.cpp +++ b/archivers/par2cmdline/files/patch-reedsolomon.cpp @@ -1,6 +1,6 @@ ---- ./reedsolomon.cpp.orig Tue May 27 02:01:31 2003 -+++ ./reedsolomon.cpp Fri Mar 23 00:49:59 2007 -@@ -51,7 +51,7 @@ +--- reedsolomon.cpp.orig 2003-05-26 18:01:31 UTC ++++ reedsolomon.cpp +@@ -51,7 +51,7 @@ u32 gcd(u32 a, u32 b) } } @@ -9,7 +9,7 @@ { inputcount = (u32)present.size(); -@@ -80,7 +80,7 @@ +@@ -80,7 +80,7 @@ bool ReedSolomon::SetInput(cons return true; } @@ -18,7 +18,7 @@ { inputcount = count; -@@ -101,7 +101,7 @@ +@@ -101,7 +101,7 @@ bool ReedSolomon::SetInput(u32 return true; } @@ -27,7 +27,7 @@ { // Look up the appropriate element in the RS matrix Galois8 factor = leftmatrix[outputindex * (datapresent + datamissing) + inputindex]; -@@ -189,7 +189,7 @@ +@@ -189,7 +189,7 @@ bool ReedSolomon::Process(size_ // Set which of the source files are present and which are missing // and compute the base values to use for the vandermonde matrix. @@ -36,7 +36,7 @@ { inputcount = (u32)present.size(); -@@ -233,7 +233,7 @@ +@@ -233,7 +233,7 @@ bool ReedSolomon::SetInput(con // Record that the specified number of source files are all present // and compute the base values to use for the vandermonde matrix. @@ -45,7 +45,7 @@ { inputcount = count; -@@ -267,7 +267,7 @@ +@@ -267,7 +267,7 @@ bool ReedSolomon::SetInput(u32 return true; } diff --git a/archivers/peazip/files/patch-peach.pas b/archivers/peazip/files/patch-peach.pas index ceb82e41270b..35a5bc967c7d 100644 --- a/archivers/peazip/files/patch-peach.pas +++ b/archivers/peazip/files/patch-peach.pas @@ -1,6 +1,6 @@ ---- peach.pas 2016-01-27 13:08:24.382120000 -0500 -+++ peach.pas 2016-01-27 13:17:34.207034000 -0500 -@@ -4445,6 +4445,7 @@ +--- peach.pas.orig 2016-07-26 12:13:05 UTC ++++ peach.pas +@@ -4468,6 +4468,7 @@ const APPLICATION5 = ''; APPLICATION6 = ''; APPLICATION7 = ''; @@ -8,7 +8,7 @@ {$ENDIF} {$IFDEF NETBSD} EXEEXT = ''; -@@ -4455,6 +4456,7 @@ +@@ -4478,6 +4479,7 @@ const APPLICATION5 = ''; APPLICATION6 = ''; APPLICATION7 = ''; @@ -16,7 +16,7 @@ {$ENDIF} {$IFDEF DARWIN} EXEEXT = ''; -@@ -4465,6 +4467,7 @@ +@@ -4488,6 +4490,7 @@ const APPLICATION5 = ''; APPLICATION6 = ''; APPLICATION7 = ''; diff --git a/archivers/pecl-rar/files/patch-config.m4 b/archivers/pecl-rar/files/patch-config.m4 index cb5a85fa4790..2144e19820aa 100644 --- a/archivers/pecl-rar/files/patch-config.m4 +++ b/archivers/pecl-rar/files/patch-config.m4 @@ -1,6 +1,6 @@ ---- config.m4.orgi 2013-05-28 16:35:29.000000000 +0800 -+++ config.m4 2013-05-28 16:35:47.000000000 +0800 -@@ -27,6 +27,6 @@ +--- config.m4.orig 2013-10-14 15:30:44 UTC ++++ config.m4 +@@ -27,6 +27,6 @@ if test "$PHP_RAR" != "no"; then PHP_REQUIRE_CXX() PHP_ADD_LIBRARY_WITH_PATH(stdc++, "", RAR_SHARED_LIBADD) diff --git a/archivers/php5-snappy/files/patch-config.m4 b/archivers/php5-snappy/files/patch-config.m4 index fef0debcffc5..ee75b443f980 100644 --- a/archivers/php5-snappy/files/patch-config.m4 +++ b/archivers/php5-snappy/files/patch-config.m4 @@ -1,6 +1,6 @@ ---- config.m4.orig 2011-09-07 10:27:21.000000000 +0200 -+++ config.m4 2014-05-17 13:31:39.000000000 +0200 -@@ -53,7 +53,7 @@ +--- config.m4.orig 2011-09-07 08:27:21 UTC ++++ config.m4 +@@ -53,7 +53,7 @@ if test "$PHP_SNAPPY" != "no"; then if test "$PHP_SNAPPY_INCLUDEDIR" != "no" && test "$PHP_SNAPPY_INCLUDEDIR" != "yes"; then if test -r "$PHP_SNAPPY_INCLUDEDIR/snappy.h"; then @@ -9,7 +9,7 @@ else AC_MSG_ERROR([Can't find snappy headers under "$PHP_SNAPPY_INCLUDEDIR"]) fi -@@ -61,12 +61,12 @@ +@@ -61,12 +61,12 @@ if test "$PHP_SNAPPY" != "no"; then SEARCH_PATH="/usr/local /usr" # you might want to change this SEARCH_FOR="/include/snappy-c.h" # you most likely want to change this if test -r $PHP_SNAPPY/$SEARCH_FOR; then # path given as parameter @@ -24,7 +24,7 @@ AC_MSG_RESULT(found in $i) fi done -@@ -80,7 +80,7 @@ +@@ -80,7 +80,7 @@ if test "$PHP_SNAPPY" != "no"; then dnl # add include path @@ -33,7 +33,7 @@ dnl # check for lib -@@ -90,7 +90,7 @@ +@@ -90,7 +90,7 @@ if test "$PHP_SNAPPY" != "no"; then AC_LANG_CPLUSPLUS AC_TRY_COMPILE( [ diff --git a/archivers/php55-phar/files/patch-config.m4 b/archivers/php55-phar/files/patch-config.m4 index 1a981bfefdc1..5e5d281265b7 100644 --- a/archivers/php55-phar/files/patch-config.m4 +++ b/archivers/php55-phar/files/patch-config.m4 @@ -1,6 +1,6 @@ ---- config.m4.orig 2011-11-25 15:31:20.000000000 +0100 -+++ config.m4 2011-11-25 15:47:45.000000000 +0100 -@@ -4,8 +4,38 @@ +--- config.m4.orig 2016-06-21 11:11:59 UTC ++++ config.m4 +@@ -4,8 +4,38 @@ dnl config.m4 for extension phar PHP_ARG_ENABLE(phar, for phar archive support, [ --disable-phar Disable phar support], yes) diff --git a/archivers/php55-phar/files/patch-phar.c b/archivers/php55-phar/files/patch-phar.c index 231ec40a8423..ae3b3230e526 100644 --- a/archivers/php55-phar/files/patch-phar.c +++ b/archivers/php55-phar/files/patch-phar.c @@ -1,6 +1,6 @@ ---- phar.c.orig 2011-11-25 15:38:44.000000000 +0100 -+++ phar.c 2011-11-25 15:39:01.000000000 +0100 -@@ -3716,7 +3716,7 @@ +--- phar.c.orig 2016-06-21 11:11:59 UTC ++++ phar.c +@@ -3651,7 +3651,7 @@ static const zend_module_dep phar_deps[] ZEND_MOD_OPTIONAL("openssl") ZEND_MOD_OPTIONAL("zlib") ZEND_MOD_OPTIONAL("standard") diff --git a/archivers/php55-zip/files/patch-config.m4 b/archivers/php55-zip/files/patch-config.m4 index a87640ff160d..fdcaae50fbc0 100644 --- a/archivers/php55-zip/files/patch-config.m4 +++ b/archivers/php55-zip/files/patch-config.m4 @@ -1,6 +1,6 @@ ---- config.m4.orig 2009-04-09 16:16:30.000000000 +0200 -+++ config.m4 2009-04-09 16:17:02.000000000 +0200 -@@ -65,6 +65,7 @@ +--- config.m4.orig 2016-06-21 11:11:59 UTC ++++ config.m4 +@@ -65,6 +65,7 @@ yes #endif ],[ PHP_PCRE_REGEX=pecl diff --git a/archivers/php55-zlib/files/patch-zlib.c b/archivers/php55-zlib/files/patch-zlib.c index 0e88fee9c5bf..62d5d711db17 100644 --- a/archivers/php55-zlib/files/patch-zlib.c +++ b/archivers/php55-zlib/files/patch-zlib.c @@ -1,10 +1,10 @@ ---- zlib.c.orig 2012-07-09 15:25:31.000000000 +0200 -+++ zlib.c 2012-07-09 15:26:07.000000000 +0200 -@@ -957,6 +957,7 @@ +--- zlib.c.orig 2016-06-21 11:11:59 UTC ++++ zlib.c +@@ -977,6 +977,7 @@ static PHP_MSHUTDOWN_FUNCTION(zlib) /* {{{ PHP_RINIT_FUNCTION */ static PHP_RINIT_FUNCTION(zlib) { + ZLIBG(output_compression) = 0; ZLIBG(compression_coding) = 0; - - php_zlib_output_compression_start(TSRMLS_C); + if (!ZLIBG(handler_registered)) { + ZLIBG(output_compression) = ZLIBG(output_compression_default); diff --git a/archivers/php56-phar/files/patch-config.m4 b/archivers/php56-phar/files/patch-config.m4 index 1a981bfefdc1..d83591d88076 100644 --- a/archivers/php56-phar/files/patch-config.m4 +++ b/archivers/php56-phar/files/patch-config.m4 @@ -1,6 +1,6 @@ ---- config.m4.orig 2011-11-25 15:31:20.000000000 +0100 -+++ config.m4 2011-11-25 15:47:45.000000000 +0100 -@@ -4,8 +4,38 @@ +--- config.m4.orig 2016-06-22 01:50:40 UTC ++++ config.m4 +@@ -4,8 +4,38 @@ dnl config.m4 for extension phar PHP_ARG_ENABLE(phar, for phar archive support, [ --disable-phar Disable phar support], yes) diff --git a/archivers/php56-phar/files/patch-phar.c b/archivers/php56-phar/files/patch-phar.c index 231ec40a8423..5a5f2fc9b755 100644 --- a/archivers/php56-phar/files/patch-phar.c +++ b/archivers/php56-phar/files/patch-phar.c @@ -1,6 +1,6 @@ ---- phar.c.orig 2011-11-25 15:38:44.000000000 +0100 -+++ phar.c 2011-11-25 15:39:01.000000000 +0100 -@@ -3716,7 +3716,7 @@ +--- phar.c.orig 2016-06-22 01:50:40 UTC ++++ phar.c +@@ -3630,7 +3630,7 @@ static const zend_module_dep phar_deps[] ZEND_MOD_OPTIONAL("openssl") ZEND_MOD_OPTIONAL("zlib") ZEND_MOD_OPTIONAL("standard") diff --git a/archivers/php56-zlib/files/patch-zlib.c b/archivers/php56-zlib/files/patch-zlib.c index 0e88fee9c5bf..894ccdc71a29 100644 --- a/archivers/php56-zlib/files/patch-zlib.c +++ b/archivers/php56-zlib/files/patch-zlib.c @@ -1,10 +1,10 @@ ---- zlib.c.orig 2012-07-09 15:25:31.000000000 +0200 -+++ zlib.c 2012-07-09 15:26:07.000000000 +0200 -@@ -957,6 +957,7 @@ +--- zlib.c.orig 2016-06-22 01:50:40 UTC ++++ zlib.c +@@ -977,6 +977,7 @@ static PHP_MSHUTDOWN_FUNCTION(zlib) /* {{{ PHP_RINIT_FUNCTION */ static PHP_RINIT_FUNCTION(zlib) { + ZLIBG(output_compression) = 0; ZLIBG(compression_coding) = 0; - - php_zlib_output_compression_start(TSRMLS_C); + if (!ZLIBG(handler_registered)) { + ZLIBG(output_compression) = ZLIBG(output_compression_default); diff --git a/archivers/php70-phar/files/patch-config.m4 b/archivers/php70-phar/files/patch-config.m4 index 07ff4a59962f..1aba3bd9a5a8 100644 --- a/archivers/php70-phar/files/patch-config.m4 +++ b/archivers/php70-phar/files/patch-config.m4 @@ -1,6 +1,6 @@ ---- config.m4.orig 2015-12-10 14:23:55.176546745 +0300 -+++ config.m4 2015-12-10 14:29:14.284524651 +0300 -@@ -4,8 +4,38 @@ +--- config.m4.orig 2016-06-21 19:56:50 UTC ++++ config.m4 +@@ -4,8 +4,38 @@ dnl config.m4 for extension phar PHP_ARG_ENABLE(phar, for phar archive support, [ --disable-phar Disable phar support], yes) diff --git a/archivers/php70-phar/files/patch-phar.c b/archivers/php70-phar/files/patch-phar.c index 7897a70585fa..e7ae6cb3328d 100644 --- a/archivers/php70-phar/files/patch-phar.c +++ b/archivers/php70-phar/files/patch-phar.c @@ -1,6 +1,6 @@ ---- phar.c.orig 2015-12-10 14:18:59.933565343 +0300 -+++ phar.c 2015-12-10 14:19:28.787563292 +0300 -@@ -3578,7 +3578,7 @@ +--- phar.c.orig 2016-06-21 19:56:49 UTC ++++ phar.c +@@ -3589,7 +3589,7 @@ static const zend_module_dep phar_deps[] ZEND_MOD_OPTIONAL("openssl") ZEND_MOD_OPTIONAL("zlib") ZEND_MOD_OPTIONAL("standard") diff --git a/archivers/php70-zlib/files/patch-zlib.c b/archivers/php70-zlib/files/patch-zlib.c index 0e88fee9c5bf..be02c50d1df6 100644 --- a/archivers/php70-zlib/files/patch-zlib.c +++ b/archivers/php70-zlib/files/patch-zlib.c @@ -1,10 +1,10 @@ ---- zlib.c.orig 2012-07-09 15:25:31.000000000 +0200 -+++ zlib.c 2012-07-09 15:26:07.000000000 +0200 -@@ -957,6 +957,7 @@ +--- zlib.c.orig 2016-06-21 19:57:08 UTC ++++ zlib.c +@@ -1480,6 +1480,7 @@ static PHP_MSHUTDOWN_FUNCTION(zlib) /* {{{ PHP_RINIT_FUNCTION */ static PHP_RINIT_FUNCTION(zlib) { + ZLIBG(output_compression) = 0; ZLIBG(compression_coding) = 0; - - php_zlib_output_compression_start(TSRMLS_C); + if (!ZLIBG(handler_registered)) { + ZLIBG(output_compression) = ZLIBG(output_compression_default); diff --git a/archivers/ppunpack/files/patch-depack.h b/archivers/ppunpack/files/patch-depack.h index 358db5625743..75e11383c299 100644 --- a/archivers/ppunpack/files/patch-depack.h +++ b/archivers/ppunpack/files/patch-depack.h @@ -1,5 +1,5 @@ ---- depack.h.orig Sat May 22 21:55:32 1999 -+++ depack.h Sat May 22 21:56:18 1999 +--- depack.h.orig 1995-03-03 14:25:04 UTC ++++ depack.h @@ -4,8 +4,10 @@ * see accompanying file README for distribution information */ diff --git a/archivers/pxz/files/patch-pxz.c b/archivers/pxz/files/patch-pxz.c index 8878d8ea28c5..4f09c008714b 100644 --- a/archivers/pxz/files/patch-pxz.c +++ b/archivers/pxz/files/patch-pxz.c @@ -1,26 +1,24 @@ ---- pxz.c.orig 2010-11-23 10:35:25.720939440 +0100 -+++ pxz.c 2010-11-23 10:46:28.910235910 +0100 -@@ -21,11 +21,17 @@ +--- pxz.c.orig 2014-10-18 17:06:27 UTC ++++ pxz.c +@@ -23,11 +23,17 @@ #include #include --#include +#ifndef __FreeBSD__ -+#include + #include +#endif #include #include #include --#include +#ifdef __FreeBSD__ +#include +#else -+#include + #include +#endif #include #include #include -@@ -40,6 +46,10 @@ +@@ -42,6 +48,10 @@ #include #endif @@ -31,7 +29,7 @@ #ifndef XZ_BINARY #define XZ_BINARY "xz" #endif -@@ -119,6 +129,13 @@ +@@ -121,6 +131,13 @@ const struct option long_opts[] = { { NULL, 0, NULL, 0 } }; diff --git a/archivers/py-lzma/files/patch-setup.py b/archivers/py-lzma/files/patch-setup.py index b3dbbc6dd3fa..f37d6a85ff34 100644 --- a/archivers/py-lzma/files/patch-setup.py +++ b/archivers/py-lzma/files/patch-setup.py @@ -1,8 +1,8 @@ ---- ./setup.py.orig 2010-10-23 22:50:04.000000000 +0200 -+++ ./setup.py 2011-01-27 02:30:39.000000000 +0100 -@@ -27,13 +27,10 @@ - from distutils import log +--- setup.py.orig 2016-07-26 12:20:39 UTC ++++ setup.py +@@ -28,13 +28,10 @@ from distutils import log from distutils.command.build_ext import build_ext as _build_ext + from version import get_git_version -try: - from setuptools import setup, Extension diff --git a/archivers/py-lzma/files/patch-src__compat__LzmaCompatDecode.h b/archivers/py-lzma/files/patch-src_compat_LzmaCompatDecode.h similarity index 56% rename from archivers/py-lzma/files/patch-src__compat__LzmaCompatDecode.h rename to archivers/py-lzma/files/patch-src_compat_LzmaCompatDecode.h index 0b606faa6022..38ab031e533b 100644 --- a/archivers/py-lzma/files/patch-src__compat__LzmaCompatDecode.h +++ b/archivers/py-lzma/files/patch-src_compat_LzmaCompatDecode.h @@ -1,6 +1,6 @@ ---- ./src/compat/LzmaCompatDecode.h.orig 2010-04-24 00:26:40.000000000 +0200 -+++ ./src/compat/LzmaCompatDecode.h 2011-01-27 02:30:39.000000000 +0100 -@@ -39,14 +39,6 @@ +--- src/compat/LzmaCompatDecode.h.orig 2016-07-26 12:20:39 UTC ++++ src/compat/LzmaCompatDecode.h +@@ -39,14 +39,6 @@ extern "C" { # define LZMACALL #endif diff --git a/archivers/py-pyliblzma/files/patch-setup.py b/archivers/py-pyliblzma/files/patch-setup.py index 7cd8df3fc6ec..d4baf46700b1 100644 --- a/archivers/py-pyliblzma/files/patch-setup.py +++ b/archivers/py-pyliblzma/files/patch-setup.py @@ -2,7 +2,7 @@ # https://bugs.launchpad.net/pyliblzma/+bug/613837 # https://bazaar.launchpad.net/~proyvind/pyliblzma/trunk/revision/494 ---- setup.py.orig 2015-11-14 02:51:37 UTC +--- setup.py.orig 2010-04-13 21:06:43 UTC +++ setup.py @@ -24,6 +24,7 @@ import sys, os, subprocess diff --git a/archivers/qpress/files/patch-qpress.cpp b/archivers/qpress/files/patch-qpress.cpp index 3e32fb406934..6c90357027d1 100644 --- a/archivers/qpress/files/patch-qpress.cpp +++ b/archivers/qpress/files/patch-qpress.cpp @@ -1,4 +1,4 @@ ---- qpress.cpp.orig 2013-11-02 00:43:30.451058000 +0000 +--- qpress.cpp.orig 2016-07-26 12:20:52 UTC +++ qpress.cpp @@ -88,6 +88,7 @@ and finally outputs an UPDIR: diff --git a/archivers/quazip-qt5/files/patch-coinstallable_with_qt4_version b/archivers/quazip-qt5/files/patch-coinstallable_with_qt4_version index 5793b3937c92..5e034c3c458b 100644 --- a/archivers/quazip-qt5/files/patch-coinstallable_with_qt4_version +++ b/archivers/quazip-qt5/files/patch-coinstallable_with_qt4_version @@ -23,9 +23,9 @@ Patch #25 (Make devel packages coinstallable too) Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt (revision 250) -+++ CMakeLists.txt (working copy) -@@ -10,10 +10,11 @@ +--- CMakeLists.txt.orig 2013-11-18 17:37:54 UTC ++++ CMakeLists.txt +@@ -10,10 +10,11 @@ endif() if (Qt5Core_FOUND) set(QTCORE_LIBRARIES ${Qt5Core_LIBRARIES}) @@ -38,7 +38,7 @@ Index: CMakeLists.txt include_directories(${Qt5Core_INCLUDE_DIRS}) macro(qt_wrap_cpp) -@@ -48,7 +49,9 @@ +@@ -48,7 +49,9 @@ SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_D set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)") set(LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name" FORCE) @@ -49,11 +49,9 @@ Index: CMakeLists.txt -install(FILES FindQuaZip.cmake DESTINATION ${CMAKE_ROOT}/Modules) +install(FILES FindQuaZip.cmake RENAME FindQuaZip${QUAZIP_LIB_VERSION_SUFFIX}.cmake DESTINATION ${CMAKE_ROOT}/Modules) -Index: FindQuaZip.cmake -=================================================================== ---- FindQuaZip.cmake (revision 250) -+++ FindQuaZip.cmake (working copy) -@@ -9,14 +9,17 @@ +--- FindQuaZip.cmake.orig 2012-02-26 06:46:10 UTC ++++ FindQuaZip.cmake +@@ -9,14 +9,17 @@ IF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRA # in cache already SET(QUAZIP_FOUND TRUE) ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) @@ -73,7 +71,7 @@ Index: FindQuaZip.cmake FIND_PATH(QUAZIP_INCLUDE_DIR NAMES quazip.h HINTS ${QUAZIP_LIBRARY_DIR}/../ PATH_SUFFIXES include/quazip) FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h) ELSE(WIN32) -@@ -25,12 +28,12 @@ +@@ -25,12 +28,12 @@ ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIB pkg_check_modules(PC_QUAZIP quazip) FIND_LIBRARY(QUAZIP_LIBRARIES WIN32_DEBUG_POSTFIX d @@ -88,11 +86,9 @@ Index: FindQuaZip.cmake ) FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include) ENDIF (WIN32) -Index: quazip/CMakeLists.txt -=================================================================== ---- quazip/CMakeLists.txt (revision 250) -+++ quazip/CMakeLists.txt (working copy) -@@ -14,10 +14,10 @@ +--- quazip/CMakeLists.txt.orig 2013-08-10 16:00:00 UTC ++++ quazip/CMakeLists.txt +@@ -14,10 +14,10 @@ ADD_DEFINITIONS(-DQUAZIP_BUILD) qt_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS}) set(SRCS ${SRCS} ${MOC_SRCS}) diff --git a/archivers/quazip/files/patch-qztest__qztest.pro b/archivers/quazip/files/patch-qztest_qztest.pro similarity index 74% rename from archivers/quazip/files/patch-qztest__qztest.pro rename to archivers/quazip/files/patch-qztest_qztest.pro index 1161e1dbecc2..9b1960fad4be 100644 --- a/archivers/quazip/files/patch-qztest__qztest.pro +++ b/archivers/quazip/files/patch-qztest_qztest.pro @@ -1,6 +1,6 @@ ---- ./qztest/qztest.pro.orig 2014-02-09 12:36:57.000000000 +0100 -+++ ./qztest/qztest.pro 2014-03-30 05:01:44.000000000 +0200 -@@ -39,7 +39,10 @@ +--- qztest/qztest.pro.orig 2014-02-10 18:04:08 UTC ++++ qztest/qztest.pro +@@ -40,7 +40,10 @@ MOC_DIR = .moc win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../quazip/release/ -lquazip else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../quazip/debug/ -lquazip diff --git a/archivers/rpm4/files/patch-lib_backend_db3.c b/archivers/rpm4/files/patch-lib_backend_db3.c index 9a88011ab7ce..8c33b429986c 100644 --- a/archivers/rpm4/files/patch-lib_backend_db3.c +++ b/archivers/rpm4/files/patch-lib_backend_db3.c @@ -1,5 +1,5 @@ ---- lib/backend/db3.c.orig 2011-03-02 07:40:10.000000000 +0100 -+++ lib/backend/db3.c 2011-06-10 15:21:12.000000000 +0200 +--- lib/backend/db3.c.orig 2014-06-30 08:47:13 UTC ++++ lib/backend/db3.c @@ -8,6 +8,8 @@ static int _debug = 1; /* XXX if < 0 deb #include diff --git a/archivers/rpm4/files/patch-lib_cpio.c b/archivers/rpm4/files/patch-lib_cpio.c index a06895394295..692e5657a6ae 100644 --- a/archivers/rpm4/files/patch-lib_cpio.c +++ b/archivers/rpm4/files/patch-lib_cpio.c @@ -1,8 +1,8 @@ Fix for CVE-2014-8118 as found at https://bugzilla.redhat.com/show_bug.cgi?id=1168715 ---- lib/cpio.c.orig 2015-03-22 19:29:29.000000000 +0100 -+++ lib/cpio.c 2015-03-22 19:29:30.000000000 +0100 +--- lib/cpio.c.orig 2014-06-30 08:47:13 UTC ++++ lib/cpio.c @@ -399,6 +399,9 @@ int rpmcpioHeaderRead(rpmcpio_t cpio, ch GET_NUM_FIELD(hdr.filesize, fsize); diff --git a/archivers/rpm4/files/patch-misc_fts.c b/archivers/rpm4/files/patch-misc_fts.c index 3a36a6b2cf40..f6c633ef28a7 100644 --- a/archivers/rpm4/files/patch-misc_fts.c +++ b/archivers/rpm4/files/patch-misc_fts.c @@ -1,5 +1,5 @@ ---- misc/fts.c 2012-04-03 15:53:59.000000000 +0200 -+++ misc/fts.c 2012-05-30 14:07:33.000000000 +0200 +--- misc/fts.c.orig 2014-06-30 08:47:14 UTC ++++ misc/fts.c @@ -31,13 +31,14 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94"; #endif /* LIBC_SCCS and not lint */ @@ -16,7 +16,7 @@ #include #include #include -@@ -61,11 +62,9 @@ +@@ -61,11 +62,9 @@ static char sccsid[] = "@(#)fts.c 8.6 (B # define _STAT_VER 0 # define __fxstat64(_stat_ver, _fd, _sbp) fstat64((_fd), (_sbp)) #endif diff --git a/archivers/rpm4/files/patch-system.h b/archivers/rpm4/files/patch-system.h index 087025591e2a..7d119aaaa7ef 100644 --- a/archivers/rpm4/files/patch-system.h +++ b/archivers/rpm4/files/patch-system.h @@ -1,6 +1,6 @@ ---- system.h.orig 2011-06-10 15:27:05.000000000 +0200 -+++ system.h 2011-06-10 15:27:09.000000000 +0200 -@@ -39,6 +39,13 @@ char * stpncpy(char * dest, const char * +--- system.h.orig 2014-06-30 08:47:14 UTC ++++ system.h +@@ -41,6 +41,13 @@ char * stpncpy(char * dest, const char * #define getenv(_s) __secure_getenv(_s) #endif diff --git a/archivers/ruby-lha/files/patch-math-remainder b/archivers/ruby-lha/files/patch-math-remainder index 2e440d04917b..fbcf5c58d7bc 100644 --- a/archivers/ruby-lha/files/patch-math-remainder +++ b/archivers/ruby-lha/files/patch-math-remainder @@ -4,37 +4,46 @@ and allow this code to compile with Ruby-2.x -mi ---- ext/slide.c 2006-09-17 13:45:51.000000000 -0400 -+++ ext/slide.c 2015-03-23 10:27:10.000000000 -0400 -@@ -88,5 +88,5 @@ +--- ext/slide.c.orig 2006-09-17 17:45:51 UTC ++++ ext/slide.c +@@ -87,7 +87,7 @@ static struct decode_option decode_set; + static unsigned int txtsiz; static unsigned long dicsiz; -static unsigned int remainder; +static unsigned int iremainder; struct matchdata { -@@ -163,5 +163,5 @@ + int len; +@@ -162,7 +162,7 @@ update_dict(pos, crc) + n = fread_crc(crc, &text[txtsiz - dicsiz], dicsiz, infile); - remainder += n; + iremainder += n; *pos -= dicsiz; -@@ -271,5 +271,5 @@ + for (i = 0; i < HSHSIZ; i++) { +@@ -270,7 +270,7 @@ search_dict(token, pos, min, m) + /* re-search */ search_dict_1(token, pos, 0, off+2, m); - if (m->len > remainder) m->len = remainder; + if (m->len > iremainder) m->len = iremainder; } -@@ -281,5 +281,5 @@ + /* slide dictionary */ +@@ -280,7 +280,7 @@ next_token(token, pos, crc) + unsigned int *pos; unsigned int *crc; { - remainder--; + iremainder--; if (++*pos >= txtsiz - maxmatch) { update_dict(pos, crc); -@@ -317,9 +317,9 @@ + #ifdef DEBUG +@@ -316,17 +316,17 @@ encode(intf) + encode_set.encode_start(); memset(text, ' ', TXTSIZ); - remainder = fread_crc(&crc, &text[dicsiz], txtsiz-dicsiz, infile); @@ -46,10 +55,11 @@ and allow this code to compile with Ruby-2.x + if (match.len > iremainder) match.len = iremainder; pos = dicsiz; -@@ -327,5 +327,5 @@ + token = INIT_HASH(pos); insert_hash(token, pos); /* associate token and pos */ - while (remainder > 0 && ! unpackable) { + while (iremainder > 0 && ! unpackable) { last = match; + next_token(&token, &pos, &crc); diff --git a/archivers/ruby-lha/files/patch-tests b/archivers/ruby-lha/files/patch-tests index bc81d47baad9..2607ce19a616 100644 --- a/archivers/ruby-lha/files/patch-tests +++ b/archivers/ruby-lha/files/patch-tests @@ -1,9 +1,11 @@ ---- test/test.rb 2006-09-17 14:32:52.000000000 -0400 -+++ test/test.rb 2015-03-23 11:18:00.000000000 -0400 -@@ -21,5 +21,5 @@ +--- test/test.rb.orig 2006-09-17 18:32:52 UTC ++++ test/test.rb +@@ -20,7 +20,7 @@ class TestLhaLib < Test::Unit::TestCase + assert(File.exist?('test.dat')) obuff = ' ' * 256 (0..255).each do |x| - obuff[x] = x + obuff[x] = x.chr end nbuff = nil + File.open('test.dat', 'rb') do |f| diff --git a/archivers/ruby-lha/files/patch-warnings b/archivers/ruby-lha/files/patch-warnings index 458060927389..75da76ac771a 100644 --- a/archivers/ruby-lha/files/patch-warnings +++ b/archivers/ruby-lha/files/patch-warnings @@ -1,6 +1,7 @@ ---- ext/crcio.c 2006-09-17 12:38:22.000000000 -0400 -+++ ext/crcio.c 2015-03-23 10:29:59.000000000 -0400 -@@ -34,9 +34,11 @@ +--- ext/crcio.c.orig 2006-09-17 16:38:22 UTC ++++ ext/crcio.c +@@ -33,11 +33,13 @@ make_crctable( /* void */ ) + /* ------------------------------------------------------------------------ */ unsigned int -calccrc(crc, p, n) @@ -14,14 +15,18 @@ + while (n-- > 0) crc = UPDATE_CRC(crc, *p++); -@@ -68,5 +70,5 @@ + return crc; +@@ -67,7 +69,7 @@ fread_crc(crcp, p, n, fp) + void fwrite_crc(crcp, p, n, fp) unsigned int *crcp; - unsigned char *p; + const unsigned char *p; int n; FILE *fp; -@@ -139,9 +141,11 @@ + { +@@ -138,11 +140,13 @@ putc_euc(c, fd) + /* ------------------------------------------------------------------------ */ int -fwrite_txt(p, n, fp) @@ -35,7 +40,9 @@ + while (--n >= 0) { if (*p != '\015' && *p != '\032') { -@@ -161,6 +165,6 @@ + #ifdef EUC +@@ -160,13 +164,14 @@ fwrite_txt(p, n, fp) + /* ------------------------------------------------------------------------ */ int -fread_txt(p, n, fp) @@ -44,24 +51,28 @@ + void *_p; int n; FILE *fp; -@@ -168,4 +172,5 @@ + { int c; int cnt = 0; + unsigned char *p = _p; while (cnt < n) { ---- ext/extract.c 2006-09-17 13:45:51.000000000 -0400 -+++ ext/extract.c 2015-03-23 10:42:48.000000000 -0400 -@@ -15,5 +15,5 @@ + if (getc_euc_cache != EOF) { +--- ext/extract.c.orig 2006-09-17 17:45:51 UTC ++++ ext/extract.c +@@ -14,7 +14,7 @@ decode_lzhuf(infp, outfp, original_size, + FILE *outfp; size_t original_size; size_t packed_size; - char *name; + const char *name; int method; size_t *read_sizep; ---- ext/header.c 2006-09-17 12:38:22.000000000 -0400 -+++ ext/header.c 2015-03-23 10:54:36.000000000 -0400 -@@ -49,10 +49,11 @@ + { +--- ext/header.c.orig 2006-09-17 16:38:22 UTC ++++ ext/header.c +@@ -48,12 +48,13 @@ int default_system_kanji_code = MULTIBYT + int default_system_kanji_code = NONE; #endif -int @@ -76,42 +87,54 @@ + const char *p = _p; while (len--) sum += *p++; -@@ -68,5 +69,5 @@ + +@@ -67,7 +68,7 @@ dump_get_byte() + int c; if (verbose_listing && verbose > 1) - printf("%02d %2d: ", get_ptr - start_ptr, 1); + printf("%02td %2d: ", get_ptr - start_ptr, 1); c = GET_BYTE(); if (verbose_listing && verbose > 1) { -@@ -85,5 +86,5 @@ + if (isprint(c)) +@@ -84,7 +85,7 @@ dump_skip_bytes(len) + { if (len == 0) return; if (verbose_listing && verbose > 1) { - printf("%02d %2d: ", get_ptr - start_ptr, len); + printf("%02td %2d: ", get_ptr - start_ptr, len); while (len--) printf("0x%02x ", GET_BYTE()); -@@ -103,5 +104,5 @@ + printf("... ignored\n"); +@@ -102,7 +103,7 @@ get_word() + #if DUMP_HEADER if (verbose_listing && verbose > 1) - printf("%02d %2d: ", get_ptr - start_ptr, 2); + printf("%02td %2d: ", get_ptr - start_ptr, 2); #endif b0 = GET_BYTE(); -@@ -131,5 +132,5 @@ + b1 = GET_BYTE(); +@@ -130,7 +131,7 @@ get_longword() + #if DUMP_HEADER if (verbose_listing && verbose > 1) - printf("%02d %2d: ", get_ptr - start_ptr, 4); + printf("%02td %2d: ", get_ptr - start_ptr, 4); #endif b0 = GET_BYTE(); -@@ -164,5 +165,5 @@ + b1 = GET_BYTE(); +@@ -163,7 +164,7 @@ get_bytes(buf, len, size) + #if DUMP_HEADER if (verbose_listing && verbose > 1) - printf("%02d %2d: \"", get_ptr - start_ptr, len); + printf("%02td %2d: \"", get_ptr - start_ptr, len); for (i = 0; i < len; i++) { -@@ -1172,9 +1173,9 @@ + if (i < size) buf[i] = get_ptr[i]; +@@ -1171,11 +1172,11 @@ seek_lha_header(fp) + /* remove leading `xxxx/..' */ -static char * @@ -125,16 +148,20 @@ + const char *ptr = NULL; if (strcmp(first, "..") == 0) { -@@ -1201,5 +1202,5 @@ + warning("Removing leading `..' from member name."); +@@ -1200,7 +1201,7 @@ remove_leading_dots(char *path) + } if (ptr) { - warning("Removing leading `%.*s' from member name.", ptr-first, first); + warning("Removing leading `%.*s' from member name.", (int)(ptr - first), first); return ptr; } ---- ext/huf.c 2006-09-17 12:38:22.000000000 -0400 -+++ ext/huf.c 2015-03-23 10:37:51.000000000 -0400 -@@ -235,7 +235,5 @@ + +--- ext/huf.c.orig 2006-09-17 16:38:22 UTC ++++ ext/huf.c +@@ -234,9 +234,7 @@ send_block( /* void */ ) + /* ------------------------------------------------------------------------ */ /* lh4, 5, 6, 7 */ void -output_st1(c, p) @@ -143,16 +170,20 @@ +output_st1(unsigned short c, unsigned short p) { static unsigned short cpos; ---- ext/lha.h 2006-09-18 04:53:29.000000000 -0400 -+++ ext/lha.h 2015-03-23 11:03:01.000000000 -0400 -@@ -212,4 +212,6 @@ + +--- ext/lha.h.orig 2006-09-18 08:53:29 UTC ++++ ext/lha.h +@@ -211,6 +211,8 @@ int fnmatch(const char *pattern, const c + #include "lha_macro.h" +unsigned char *alloc_buf(void); + #define exit(n) lha_exit(n) -@@ -301,32 +303,34 @@ + struct encode_option { +@@ -300,41 +302,56 @@ LHALIB_EXTERN void cmd_extract(const cha + LHALIB_EXTERN FILE * open_old_archive(const char* archive); LHALIB_EXTERN boolean need_file(const char*); LHALIB_EXTERN boolean archive_is_msdos_sfx1(const char*); -LHALIB_EXTERN void output_dyn(); @@ -214,7 +245,8 @@ +LHALIB_EXTERN void init_code_cache(void); LHALIB_EXTERN void putcode(unsigned char n, unsigned short x); LHALIB_EXTERN void putbits(unsigned char n, unsigned short x); -@@ -335,5 +339,18 @@ + LHALIB_EXTERN unsigned short getbits(unsigned char n); + LHALIB_EXTERN void fillbuf(unsigned char n); LHALIB_EXTERN void encode_p_st0(unsigned short j); - @@ -234,34 +266,42 @@ +PRINTF_ARGS(int xsnprintf(char *dst, size_t size, const char *fmt, ...), 3, 4); #define start_indicator(name, size, ing, len) 0 ---- ext/lhalib.c 2006-09-18 05:11:35.000000000 -0400 -+++ ext/lhalib.c 2015-03-23 11:00:35.000000000 -0400 -@@ -19,5 +19,5 @@ + #define finish_indicator(name, ed) 0 +--- ext/lhalib.c.orig 2006-09-18 09:11:35 UTC ++++ ext/lhalib.c +@@ -18,7 +18,7 @@ + #define LHALIB_VERSION "0.8.1" #include "lha.h" -#include "st.h" +#include static VALUE lhalib; -@@ -76,5 +76,5 @@ + +@@ -75,7 +75,7 @@ static VALUE s_ex(int argc, VALUE* argv, + VALUE file; proc = Qnil; rb_scan_args(argc, argv, "1&", &file, &proc); - rb_check_safe_str(file); + SafeStringValue(file); rb_secure(4); ---- ext/lharc.c 2006-09-17 12:38:22.000000000 -0400 -+++ ext/lharc.c 2015-03-23 10:58:33.000000000 -0400 -@@ -53,5 +53,5 @@ + file_count = 0; +--- ext/lharc.c.orig 2006-09-17 16:38:22 UTC ++++ ext/lharc.c +@@ -52,7 +52,7 @@ static int error_occurred; + /* ------------------------------------------------------------------------ */ static boolean open_old_archive_1(name, v_fp) - char *name; + const char *name; FILE **v_fp; { ---- ext/lhext.c 2006-09-17 12:38:22.000000000 -0400 -+++ ext/lhext.c 2015-03-23 10:41:48.000000000 -0400 -@@ -27,6 +27,7 @@ + FILE *fp; +--- ext/lhext.c.orig 2006-09-17 16:38:22 UTC ++++ ext/lhext.c +@@ -26,8 +26,9 @@ static char *methods[] = + NULL }; -static void add_dirinfo(char* name, LzHeader* hdr); @@ -271,7 +311,9 @@ +static int is_directory_traversal(const char *path); /* ------------------------------------------------------------------------ */ -@@ -396,6 +397,6 @@ + static boolean +@@ -395,8 +396,8 @@ cmd_extract(const char* archive_name, ad + return; } -int @@ -280,16 +322,20 @@ +is_directory_traversal(const char *path) { int state = 0; -@@ -437,5 +438,5 @@ + +@@ -436,7 +437,7 @@ typedef struct lhdDirectoryInfo_t { + static LzHeaderList *dirinfo; -static void add_dirinfo(char *name, LzHeader *hdr) +static void add_dirinfo(const char *name, LzHeader *hdr) { LzHeaderList *p; ---- ext/maketbl.c 2006-09-17 12:38:22.000000000 -0400 -+++ ext/maketbl.c 2015-03-23 10:32:06.000000000 -0400 -@@ -10,9 +10,6 @@ + +--- ext/maketbl.c.orig 2006-09-17 16:38:22 UTC ++++ ext/maketbl.c +@@ -9,11 +9,8 @@ + #include "lha.h" void -make_table(nchar, bitlen, tablebits, table) @@ -301,18 +347,22 @@ + unsigned short table[]) { unsigned short count[17]; /* count of bitlen */ ---- ext/maketree.c 2006-09-17 13:36:33.000000000 -0400 -+++ ext/maketree.c 2015-03-23 11:02:50.000000000 -0400 -@@ -96,5 +96,5 @@ + unsigned short weight[17]; /* 0x10000ul >> bitlen */ +--- ext/maketree.c.orig 2006-09-17 17:36:33 UTC ++++ ext/maketree.c +@@ -95,7 +95,7 @@ downheap(i, heap, heapsize, freq) + int i; short *heap; size_t heapsize; - unsigned short *freq; + const unsigned short *freq; { short j, k; ---- ext/util.c 2006-09-18 04:53:29.000000000 -0400 -+++ ext/util.c 2015-03-23 10:57:53.000000000 -0400 -@@ -115,8 +115,9 @@ + +--- ext/util.c.orig 2006-09-18 08:53:29 UTC ++++ ext/util.c +@@ -114,10 +114,11 @@ archive_is_msdos_sfx1(const char* name) + int #if STDC_HEADERS -xsnprintf(char *dest, size_t size, char *fmt, ...) @@ -324,3 +374,4 @@ + const char *fmt; size_t size; va_dcl + #endif diff --git a/archivers/rubygem-bzip2-ruby/files/patch-ext__bzip2.c b/archivers/rubygem-bzip2-ruby/files/patch-ext_bzip2.c similarity index 59% rename from archivers/rubygem-bzip2-ruby/files/patch-ext__bzip2.c rename to archivers/rubygem-bzip2-ruby/files/patch-ext_bzip2.c index bf3684c0d271..05384a6fbdda 100644 --- a/archivers/rubygem-bzip2-ruby/files/patch-ext__bzip2.c +++ b/archivers/rubygem-bzip2-ruby/files/patch-ext_bzip2.c @@ -1,6 +1,6 @@ ---- ./ext/bzip2.c.orig 2014-08-23 18:00:07.743290567 +0000 -+++ ./ext/bzip2.c 2014-08-23 18:00:07.790289811 +0000 -@@ -247,9 +247,6 @@ +--- ext/bzip2.c.orig 2016-07-26 12:25:25 UTC ++++ ext/bzip2.c +@@ -247,9 +247,6 @@ static VALUE bz_writer_close(VALUE obj) Get_BZ2(obj, bzf); res = bz_writer_internal_close(bzf); diff --git a/archivers/rubygem-bzip2-ruby/files/patch-ext__extconf.rb b/archivers/rubygem-bzip2-ruby/files/patch-ext_extconf.rb similarity index 69% rename from archivers/rubygem-bzip2-ruby/files/patch-ext__extconf.rb rename to archivers/rubygem-bzip2-ruby/files/patch-ext_extconf.rb index e0d93697504f..f64c6649612e 100644 --- a/archivers/rubygem-bzip2-ruby/files/patch-ext__extconf.rb +++ b/archivers/rubygem-bzip2-ruby/files/patch-ext_extconf.rb @@ -1,6 +1,6 @@ ---- ./ext/extconf.rb.orig 2013-12-12 21:55:36.054257218 +0000 -+++ ./ext/extconf.rb 2013-12-12 21:55:51.579256255 +0000 -@@ -11,11 +11,9 @@ +--- ext/extconf.rb.orig 2016-07-26 12:25:25 UTC ++++ ext/extconf.rb +@@ -11,11 +11,9 @@ if have_library("bz2", "BZ2_bzWriteOpen" $static = nil end diff --git a/archivers/rvm/files/patch-reporter.cc b/archivers/rvm/files/patch-reporter.cc index 129bf7fd6529..f2886daae0b4 100644 --- a/archivers/rvm/files/patch-reporter.cc +++ b/archivers/rvm/files/patch-reporter.cc @@ -1,10 +1,10 @@ ---- reporter.cc.orig Thu Mar 25 00:28:09 2004 -+++ reporter.cc Sat Apr 3 21:26:51 2004 +--- reporter.cc.orig 2014-01-07 20:30:56 UTC ++++ reporter.cc @@ -4,6 +4,7 @@ #include #include #include +#include - #include "debug.h" + #include "asserts.h" #include "error.h" diff --git a/archivers/rvm/files/patch-vaulter.cpp b/archivers/rvm/files/patch-vaulter.cc similarity index 51% rename from archivers/rvm/files/patch-vaulter.cpp rename to archivers/rvm/files/patch-vaulter.cc index ba57d2db207a..479fe9942810 100644 --- a/archivers/rvm/files/patch-vaulter.cpp +++ b/archivers/rvm/files/patch-vaulter.cc @@ -1,10 +1,10 @@ ---- vaulter.cc.orig Wed Mar 24 05:03:42 2004 -+++ vaulter.cc Sat Apr 3 21:24:37 2004 +--- vaulter.cc.orig 2014-11-12 13:09:24 UTC ++++ vaulter.cc @@ -4,6 +4,7 @@ #include #include #include +#include - #include "debug.h" + #include "asserts.h" #include "error.h" diff --git a/archivers/rzip/files/patch-Makefile.in b/archivers/rzip/files/patch-Makefile.in index 31c6ad48cef4..5d76bac31eac 100644 --- a/archivers/rzip/files/patch-Makefile.in +++ b/archivers/rzip/files/patch-Makefile.in @@ -1,5 +1,5 @@ ---- ./Makefile.in.orig 2013-11-15 10:34:18.246331970 +0100 -+++ ./Makefile.in 2013-11-15 10:34:38.383364598 +0100 +--- Makefile.in.orig 2006-02-14 00:38:23 UTC ++++ Makefile.in @@ -3,8 +3,8 @@ prefix=@prefix@ diff --git a/archivers/sharutils/files/patch-intl__Makefile.in b/archivers/sharutils/files/patch-intl_Makefile.in similarity index 78% rename from archivers/sharutils/files/patch-intl__Makefile.in rename to archivers/sharutils/files/patch-intl_Makefile.in index b88aa5df3f18..723c5e53268c 100644 --- a/archivers/sharutils/files/patch-intl__Makefile.in +++ b/archivers/sharutils/files/patch-intl_Makefile.in @@ -1,6 +1,6 @@ ---- intl/Makefile.in.orig 2013-06-11 08:30:00.000000000 -0300 -+++ intl/Makefile.in 2013-06-11 08:31:11.000000000 -0300 -@@ -447,7 +447,6 @@ +--- intl/Makefile.in.orig 2015-05-30 15:35:20 UTC ++++ intl/Makefile.in +@@ -451,7 +451,6 @@ install-exec: all temp=$(DESTDIR)$(localedir)/t-locale.alias; \ dest=$(DESTDIR)$(localedir)/locale.alias; \ sed -f ref-add.sed $$orig > $$temp; \ @@ -8,7 +8,7 @@ rm -f $$temp; \ else \ : ; \ -@@ -556,11 +555,6 @@ +@@ -559,11 +558,6 @@ uninstall: temp=$(DESTDIR)$(localedir)/t-locale.alias; \ dest=$(DESTDIR)$(localedir)/locale.alias; \ sed -f ref-del.sed $$dest > $$temp; \ diff --git a/archivers/sharutils/files/patch-lib__Makefile.in b/archivers/sharutils/files/patch-lib_Makefile.in similarity index 67% rename from archivers/sharutils/files/patch-lib__Makefile.in rename to archivers/sharutils/files/patch-lib_Makefile.in index 5d48eed40a6b..3dfc30ed5eeb 100644 --- a/archivers/sharutils/files/patch-lib__Makefile.in +++ b/archivers/sharutils/files/patch-lib_Makefile.in @@ -1,6 +1,6 @@ ---- lib/Makefile.in.orig 2010-03-04 12:31:24.000000000 -0300 -+++ lib/Makefile.in 2010-03-04 12:31:35.000000000 -0300 -@@ -1592,7 +1592,7 @@ +--- lib/Makefile.in.orig 2015-05-30 15:35:32 UTC ++++ lib/Makefile.in +@@ -2126,7 +2126,7 @@ install-exec-localcharset: all-local case '$(host_os)' in \ darwin[56]*) \ need_charset_alias=true ;; \ diff --git a/archivers/snappy-java/files/patch-likelinux b/archivers/snappy-java/files/patch-likelinux index e2cbea524c08..8c674a37d205 100644 --- a/archivers/snappy-java/files/patch-likelinux +++ b/archivers/snappy-java/files/patch-likelinux @@ -1,6 +1,6 @@ ---- Makefile.common.orig 2011-10-05 03:29:42.000000000 +0200 -+++ Makefile.common 2013-05-13 02:19:31.000000000 +0200 -@@ -50,8 +50,8 @@ +--- Makefile.common.orig 2011-10-05 01:29:42 UTC ++++ Makefile.common +@@ -50,8 +50,8 @@ endif Default_CXX := g++ Default_STRIP := strip diff --git a/archivers/squsq/files/patch-usq.c b/archivers/squsq/files/patch-usq.c index 496a192ae68f..c1287d023034 100644 --- a/archivers/squsq/files/patch-usq.c +++ b/archivers/squsq/files/patch-usq.c @@ -1,6 +1,6 @@ ---- usq.c.orig Sun Jan 17 01:54:04 1988 -+++ usq.c Sun Jan 17 01:54:05 1988 -@@ -215,7 +215,7 @@ +--- usq.c.orig 1988-01-17 00:54:04 UTC ++++ usq.c +@@ -215,7 +215,7 @@ char *infile; goto closein; } @@ -9,7 +9,7 @@ filecrc = getx16(inbuff); #else filecrc = getw16(inbuff); -@@ -239,7 +239,7 @@ +@@ -239,7 +239,7 @@ char *infile; printf("%s -> %s: ", infile, outfile); #endif diff --git a/archivers/star/files/patch-rmt_Makefile b/archivers/star/files/patch-rmt_Makefile index 0d97110a8ec6..6affa15542a3 100644 --- a/archivers/star/files/patch-rmt_Makefile +++ b/archivers/star/files/patch-rmt_Makefile @@ -1,4 +1,4 @@ ---- rmt/Makefile.orig 2016-02-10 20:47:23 UTC +--- rmt/Makefile.orig 2011-04-15 20:06:22 UTC +++ rmt/Makefile @@ -6,13 +6,13 @@ include $(SRCROOT)/$(RULESDIR)/rules.to ########################################################################### diff --git a/archivers/star/files/patch-rmt_Makefile.man b/archivers/star/files/patch-rmt_Makefile.man index 9243d0e8ef38..5898f2547021 100644 --- a/archivers/star/files/patch-rmt_Makefile.man +++ b/archivers/star/files/patch-rmt_Makefile.man @@ -1,4 +1,4 @@ ---- rmt/Makefile.man.orig 2016-02-10 20:47:23 UTC +--- rmt/Makefile.man.orig 2000-12-04 21:25:51 UTC +++ rmt/Makefile.man @@ -8,10 +8,10 @@ include $(SRCROOT)/$(RULESDIR)/rules.to ########################################################################### diff --git a/archivers/star/files/patch-star_Makefile b/archivers/star/files/patch-star_Makefile index 42e4205fd3b1..84179542d96c 100644 --- a/archivers/star/files/patch-star_Makefile +++ b/archivers/star/files/patch-star_Makefile @@ -1,4 +1,4 @@ ---- star/Makefile.orig 2016-02-10 20:47:23 UTC +--- star/Makefile.orig 2010-05-13 19:47:27 UTC +++ star/Makefile @@ -15,7 +15,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to INSDIR= bin diff --git a/archivers/star/files/patch-star_star.1 b/archivers/star/files/patch-star_star.1 index 5c459c9297c0..e4cd5c224792 100644 --- a/archivers/star/files/patch-star_star.1 +++ b/archivers/star/files/patch-star_star.1 @@ -1,4 +1,4 @@ ---- star/star.1.orig 2016-02-10 20:47:23 UTC +--- star/star.1.orig 2011-04-12 17:34:22 UTC +++ star/star.1 @@ -32,14 +32,6 @@ star \- unique standard tape archiver .I file1 .\|.\|. filen diff --git a/archivers/torrentzip/files/patch-src-trrntzip.c b/archivers/torrentzip/files/patch-src-trrntzip.c index e54c5b305054..ee9c83c33731 100644 --- a/archivers/torrentzip/files/patch-src-trrntzip.c +++ b/archivers/torrentzip/files/patch-src-trrntzip.c @@ -1,6 +1,6 @@ ---- src/trrntzip.c-orig Mon May 2 08:38:40 2005 -+++ src/trrntzip.c Sat May 7 02:51:55 2005 -@@ -716,7 +716,7 @@ +--- src/trrntzip.c.orig 2005-05-02 13:38:40 UTC ++++ src/trrntzip.c +@@ -716,7 +716,7 @@ RecursiveMigrate (const char *pszPath, W if (dirp) { @@ -9,7 +9,7 @@ // our new zipfiles if they are returned by readdir() a second time. while (direntp = readdir (dirp)) { -@@ -732,7 +732,7 @@ +@@ -732,7 +732,7 @@ RecursiveMigrate (const char *pszPath, W if (strstr (szTmpBuf, ".zip\0")) { @@ -18,7 +18,7 @@ } } // Zip file is actually a dir -@@ -780,9 +780,9 @@ +@@ -780,9 +780,9 @@ RecursiveMigrate (const char *pszPath, W sprintf (szTmpBuf, "%s", direntp->d_name); strlwr (szTmpBuf); diff --git a/archivers/unace/files/patch-CVE-2015-2063 b/archivers/unace/files/patch-CVE-2015-2063 index 72c0fb38e707..046844c6e261 100644 --- a/archivers/unace/files/patch-CVE-2015-2063 +++ b/archivers/unace/files/patch-CVE-2015-2063 @@ -10,13 +10,9 @@ Bug-Debian: https://bugs.debian.org/775003 Forwarded: no Last-Update: 2015-02-24 ---- - unace.c | 25 +++++++++++++++++++++++-- - 1 file changed, 23 insertions(+), 2 deletions(-) - ---- unace.c +--- unace.c.orig 1998-07-01 08:29:00 UTC +++ unace.c -@@ -113,6 +113,7 @@ INT read_header(INT print_err) +@@ -111,6 +111,7 @@ INT read_header(INT print_err) { USHORT rd, head_size, @@ -24,7 +20,7 @@ Last-Update: 2015-02-24 crc_ok; LONG crc; UCHAR *tp=readbuf; -@@ -128,6 +129,9 @@ INT read_header(INT print_err) +@@ -126,6 +127,9 @@ INT read_header(INT print_err) #endif // read size_headrdb bytes into head_size = head.HEAD_SIZE; // header structure @@ -34,7 +30,7 @@ Last-Update: 2015-02-24 rd = (head_size > size_headrdb) ? size_headrdb : head_size; if (read(archan, readbuf, rd) < rd) return 0; -@@ -147,7 +151,12 @@ INT read_header(INT print_err) +@@ -145,7 +149,12 @@ INT read_header(INT print_err) head.HEAD_FLAGS=BUFP2WORD(tp); if (head.HEAD_FLAGS & ACE_ADDSIZE) @@ -47,7 +43,7 @@ Last-Update: 2015-02-24 else skipsize = 0; -@@ -158,6 +167,9 @@ INT read_header(INT print_err) +@@ -156,6 +165,9 @@ INT read_header(INT print_err) switch (head.HEAD_TYPE) // specific buffer to head conversion { case MAIN_BLK: @@ -57,7 +53,7 @@ Last-Update: 2015-02-24 memcpy(mhead.ACESIGN, tp, acesign_len); tp+=acesign_len; mhead.VER_MOD=*tp++; mhead.VER_CR =*tp++; -@@ -168,9 +180,15 @@ INT read_header(INT print_err) +@@ -166,9 +178,15 @@ INT read_header(INT print_err) mhead.RES2 =BUFP2WORD(tp); mhead.RES =BUFP2LONG(tp); mhead.AV_SIZE=*tp++; @@ -74,7 +70,7 @@ Last-Update: 2015-02-24 fhead.PSIZE =BUFP2LONG(tp); fhead.SIZE =BUFP2LONG(tp); fhead.FTIME =BUFP2LONG(tp); -@@ -181,7 +199,10 @@ INT read_header(INT print_err) +@@ -179,7 +197,10 @@ INT read_header(INT print_err) fhead.TECH.PARM =BUFP2WORD(tp); fhead.RESERVED =BUFP2WORD(tp); fhead.FNAME_SIZE=BUFP2WORD(tp); diff --git a/archivers/unace/files/patch-uac__crt.c b/archivers/unace/files/patch-uac__crt.c index 0502e49a5d01..857c44127b16 100644 --- a/archivers/unace/files/patch-uac__crt.c +++ b/archivers/unace/files/patch-uac__crt.c @@ -1,4 +1,4 @@ ---- uac_crt.c.orig +--- uac_crt.c.orig 1998-07-01 08:29:00 UTC +++ uac_crt.c @@ -33,12 +33,15 @@ @@ -19,7 +19,7 @@ s[i] = 0; if (nopath) -@@ -56,22 +59,72 @@ +@@ -56,22 +59,72 @@ CHAR *ace_fname(CHAR * s, thead * head, } #endif diff --git a/archivers/unace/files/patch-unace.c b/archivers/unace/files/patch-unace.c index 77a8bf769f81..398895e2213e 100644 --- a/archivers/unace/files/patch-unace.c +++ b/archivers/unace/files/patch-unace.c @@ -1,6 +1,6 @@ ---- unace.c.orig +--- unace.c.orig 1998-07-01 08:29:00 UTC +++ unace.c -@@ -240,6 +240,7 @@ +@@ -240,6 +240,7 @@ INT read_arc_head(void) // searc INT open_archive(INT print_err) // opens archive (or volume) { CHAR av_str[80]; @@ -8,7 +8,7 @@ archan = open(aname, O_RDONLY | O_BINARY); // open file -@@ -263,8 +264,11 @@ +@@ -263,8 +264,11 @@ INT open_archive(INT print_err) sprintf(av_str, "\ncreated on %d.%d.%d by ", ts_day(adat.time_cr), ts_month(adat.time_cr), ts_year(adat.time_cr)); printf(av_str); @@ -22,7 +22,7 @@ printf("%s\n\n", av_str); } comment_out("Main comment:"); // print main comment -@@ -300,7 +304,7 @@ +@@ -300,7 +304,7 @@ void get_next_volname(void) INT proc_vol(void) // opens volume { INT i; @@ -31,7 +31,7 @@ // if f_allvol_pr is 2 we have -y and should never ask if ((!fileexists_insense(aname) && f_allvol_pr != 2) || !f_allvol_pr) -@@ -428,7 +432,7 @@ +@@ -428,7 +432,7 @@ void extract_files(int nopath, int test) if (head.HEAD_TYPE == FILE_BLK) { comment_out("File comment:"); // show file comment @@ -40,7 +40,7 @@ printf("\n%s", file); flush; dcpr_init_file(); // initialize decompression of file -@@ -496,7 +500,7 @@ +@@ -496,7 +500,7 @@ void list_files(int verbose) if (head.HEAD_TYPE == FILE_BLK) { ULONG ti=fhead.FTIME; @@ -49,7 +49,7 @@ size += fhead.SIZE; psize += -@@ -588,7 +592,8 @@ +@@ -588,7 +592,8 @@ int main(INT argc, CHAR * argv[]) init_unace(); // initialize unace diff --git a/archivers/unalz/files/patch-UnAlz.cpp b/archivers/unalz/files/patch-UnAlz.cpp index d440e9108cc0..627cce0c8cbe 100644 --- a/archivers/unalz/files/patch-UnAlz.cpp +++ b/archivers/unalz/files/patch-UnAlz.cpp @@ -1,4 +1,4 @@ ---- UnAlz.cpp.orig 2014-07-07 10:40:53.000000000 +0000 +--- UnAlz.cpp.orig 2016-07-26 12:39:47 UTC +++ UnAlz.cpp @@ -37,7 +37,7 @@ # include diff --git a/archivers/unarchiver/files/patch-UniversalDetector_Makefile.freebsd b/archivers/unarchiver/files/patch-UniversalDetector_Makefile.freebsd index 021d56a92c93..1552fbb68434 100644 --- a/archivers/unarchiver/files/patch-UniversalDetector_Makefile.freebsd +++ b/archivers/unarchiver/files/patch-UniversalDetector_Makefile.freebsd @@ -1,4 +1,4 @@ ---- UniversalDetector/Makefile.freebsd.orig 2015-09-23 20:24:59 UTC +--- UniversalDetector/Makefile.freebsd.orig 2016-05-17 06:39:04 UTC +++ UniversalDetector/Makefile.freebsd @@ -1,10 +1,7 @@ # Compilers and linkers diff --git a/archivers/unarchiver/files/patch-XADMaster_Makefile.common b/archivers/unarchiver/files/patch-XADMaster_Makefile.common index 353e5576da1d..d6ea2a344371 100644 --- a/archivers/unarchiver/files/patch-XADMaster_Makefile.common +++ b/archivers/unarchiver/files/patch-XADMaster_Makefile.common @@ -1,6 +1,6 @@ ---- XADMaster/Makefile.common.orig 2015-09-23 20:24:59 UTC +--- XADMaster/Makefile.common.orig 2016-05-17 06:39:04 UTC +++ XADMaster/Makefile.common -@@ -206,12 +206,6 @@ LIBRARY_C_FILES = BWT.c \ +@@ -209,12 +209,6 @@ LIBRARY_C_FILES = BWT.c \ PPMd/VariantG.c \ PPMd/VariantH.c \ PPMd/VariantI.c \ diff --git a/archivers/unarchiver/files/patch-XADMaster_Makefile.freebsd b/archivers/unarchiver/files/patch-XADMaster_Makefile.freebsd index 1bb2b350c391..b2f911d28c3f 100644 --- a/archivers/unarchiver/files/patch-XADMaster_Makefile.freebsd +++ b/archivers/unarchiver/files/patch-XADMaster_Makefile.freebsd @@ -1,4 +1,4 @@ ---- XADMaster/Makefile.freebsd.orig 2015-09-23 20:24:59 UTC +--- XADMaster/Makefile.freebsd.orig 2016-05-17 06:39:04 UTC +++ XADMaster/Makefile.freebsd @@ -1,10 +1,7 @@ # Compilers and linkers diff --git a/archivers/unarchiver/files/patch-XADMaster_XADWinZipWavPackHandle.h b/archivers/unarchiver/files/patch-XADMaster_XADWinZipWavPackHandle.h index 97c304b11734..a58dd5f5a5dd 100644 --- a/archivers/unarchiver/files/patch-XADMaster_XADWinZipWavPackHandle.h +++ b/archivers/unarchiver/files/patch-XADMaster_XADWinZipWavPackHandle.h @@ -1,4 +1,4 @@ ---- XADMaster/XADWinZipWavPackHandle.h.orig 2015-09-23 20:24:59 UTC +--- XADMaster/XADWinZipWavPackHandle.h.orig 2016-05-17 06:39:04 UTC +++ XADMaster/XADWinZipWavPackHandle.h @@ -1,6 +1,6 @@ #import "CSBlockStreamHandle.h" diff --git a/archivers/unarj/files/patch-CVE-2004-0947 b/archivers/unarj/files/patch-CVE-2004-0947 index b66db317b198..317d595de984 100644 --- a/archivers/unarj/files/patch-CVE-2004-0947 +++ b/archivers/unarj/files/patch-CVE-2004-0947 @@ -1,6 +1,8 @@ - Fix buffer overflow problem in filename handling (CAN-2004-0947) -Index: unarj.c -@@ -217,7 +217,7 @@ static uchar arj_flags; + +--- unarj.c.orig 2002-06-05 08:28:06 UTC ++++ unarj.c +@@ -213,7 +213,7 @@ static uchar arj_flags; static short method; static uint file_mode; static ulong time_stamp; @@ -9,7 +11,7 @@ Index: unarj.c static ushort host_data; static uchar *get_ptr; static UCRC file_crc; -@@ -608,6 +608,7 @@ char *name; +@@ -604,6 +604,7 @@ char *name; error(M_BADHEADR, ""); crc = CRC_MASK; @@ -17,7 +19,7 @@ Index: unarj.c fread_crc(header, (int) headersize, fd); header_crc = fget_crc(fd); if ((crc ^ CRC_MASK) != header_crc) -@@ -632,9 +633,13 @@ char *name; +@@ -628,9 +629,13 @@ char *name; if (origsize < 0 || compsize < 0) error(M_HEADRCRC, ""); @@ -31,7 +33,7 @@ Index: unarj.c if (host_os != OS) strparity((uchar *)filename); if ((arj_flags & PATHSYM_FLAG) != 0) -@@ -733,11 +738,11 @@ extract() +@@ -727,11 +732,11 @@ extract() no_output = 0; if (command == 'E') diff --git a/archivers/unarj/files/patch-CVE-2004-1027 b/archivers/unarj/files/patch-CVE-2004-1027 index 7a236040cc09..28b54b85f922 100644 --- a/archivers/unarj/files/patch-CVE-2004-1027 +++ b/archivers/unarj/files/patch-CVE-2004-1027 @@ -1,30 +1,8 @@ - Fix unchecked path extraction problem (CAN-2004-1027) -Index: unarj.c -@@ -235,6 +235,8 @@ static UCRC crctable[UCHAR_MAX + 1]; - - /* Functions */ - -+void copy_path_relative(char *dest, char *src, size_t len); -+ - static void - make_crctable() - { -@@ -738,11 +740,11 @@ extract() - - no_output = 0; - if (command == 'E') -- strncopy(name, &filename[entry_pos], sizeof(name)); -+ copy_path_relative(name, &filename[entry_pos], sizeof(name)); - else - { - strcpy(name, DEFAULT_DIR); -- strncopy(name+strlen(name), filename, sizeof(name)-strlen(name)); -+ copy_path_relative(name+strlen(name), filename, sizeof(name)-strlen(name)); - } - - if (host_os != OS) -Index: Makefile -@@ -9,7 +9,9 @@ + +--- Makefile.orig 2004-11-29 13:47:24 UTC ++++ Makefile +@@ -9,7 +9,9 @@ environ.o: environ.c unarj.h decode.o: decode.c unarj.h @@ -35,7 +13,8 @@ Index: Makefile unarj: $(OBJS) $(CC) $(LDFLAGS) $(OBJS) -o unarj -Index: sanitize.c +--- sanitize.c.orig 2016-07-26 12:41:37 UTC ++++ sanitize.c @@ -0,0 +1,81 @@ +/* + * Path sanitation code by Ludwig Nussel . Public Domain. @@ -118,3 +97,28 @@ Index: sanitize.c + } + o[len?0:-1] = '\0'; +} +--- unarj.c.orig 2016-07-26 12:41:37 UTC ++++ unarj.c +@@ -231,6 +231,8 @@ static UCRC crctable[UCHAR_MAX + 1]; + + /* Functions */ + ++void copy_path_relative(char *dest, char *src, size_t len); ++ + static void + make_crctable() + { +@@ -732,11 +734,11 @@ extract() + + no_output = 0; + if (command == 'E') +- strncopy(name, &filename[entry_pos], sizeof(name)); ++ copy_path_relative(name, &filename[entry_pos], sizeof(name)); + else + { + strcpy(name, DEFAULT_DIR); +- strncopy(name+strlen(name), filename, sizeof(name)-strlen(name)); ++ copy_path_relative(name+strlen(name), filename, sizeof(name)-strlen(name)); + } + + if (host_os != OS) diff --git a/archivers/unarj/files/patch-environ.c b/archivers/unarj/files/patch-environ.c index 43f2e4c66c96..ed827668c968 100644 --- a/archivers/unarj/files/patch-environ.c +++ b/archivers/unarj/files/patch-environ.c @@ -1,6 +1,6 @@ ---- environ.c.orig Mon Sep 29 14:00:24 1997 -+++ environ.c Thu Feb 18 01:14:35 1999 -@@ -430,16 +430,24 @@ +--- environ.c.orig 2002-06-05 08:28:06 UTC ++++ environ.c +@@ -430,16 +430,24 @@ uint host; #define SUBS_DEFINED @@ -28,7 +28,7 @@ FILE * file_open(name, mode) -@@ -535,8 +543,12 @@ +@@ -535,8 +543,12 @@ uint mode; } long @@ -42,7 +42,7 @@ #define NOONOFFSET 43200L #define SEC_IN_DAY (24L * 60L * 60L) #define INV_VALUE (SEC_IN_DAY + 1L) -@@ -552,6 +564,7 @@ +@@ -552,6 +564,7 @@ gettz() /* returns the offset fr noontm = localtime(&noon); retval = NOONOFFSET - 60 * (60 * noontm->tm_hour - noontm->tm_min); return retval; @@ -50,7 +50,7 @@ } long -@@ -600,19 +613,29 @@ +@@ -600,19 +613,29 @@ uint host; { time_t m_time; struct utimbuf diff --git a/archivers/unarj/files/patch-unarj.c b/archivers/unarj/files/patch-unarj.c index 5b683946234c..d348abe13792 100644 --- a/archivers/unarj/files/patch-unarj.c +++ b/archivers/unarj/files/patch-unarj.c @@ -1,5 +1,5 @@ ---- unarj.c.orig Wed Jun 5 12:28:06 2002 -+++ unarj.c Mon Nov 29 17:48:27 2004 +--- unarj.c.orig 2002-06-05 08:28:06 UTC ++++ unarj.c @@ -54,6 +54,10 @@ #include #include @@ -11,7 +11,7 @@ #else /* !MODERN */ extern void free(); extern void exit(); -@@ -718,6 +722,8 @@ +@@ -718,6 +722,8 @@ static int extract() { char name[FNAME_MAX]; @@ -20,11 +20,10 @@ if (check_flags()) { -@@ -736,6 +742,21 @@ - +@@ -737,6 +743,21 @@ extract() if (host_os != OS) default_case_path(name); -+ + + + /* + 8/8/2000 Phil Knirsch: Bugfix to create subdirectories. Unarj didn't @@ -39,6 +38,7 @@ + mkdir(dir, 0777); + pos = strchr(pos+1, PATH_CHAR); + } - ++ if (file_exists(name)) { + printf(M_FEXISTS, name); diff --git a/archivers/unarj/files/patch-unarj.h b/archivers/unarj/files/patch-unarj.h index 42d3e4a23b6c..79c120416fbb 100644 --- a/archivers/unarj/files/patch-unarj.h +++ b/archivers/unarj/files/patch-unarj.h @@ -1,5 +1,5 @@ ---- unarj.h.orig Mon Sep 29 14:00:24 1997 -+++ unarj.h Thu Feb 18 01:06:10 1999 +--- unarj.h.orig 2002-06-05 08:28:06 UTC ++++ unarj.h @@ -106,8 +106,12 @@ #endif diff --git a/archivers/unshield/files/patch-unshield-v2-format b/archivers/unshield/files/patch-unshield-v2-format index 85a7ce9b0b7a..fae6714ebbcb 100644 --- a/archivers/unshield/files/patch-unshield-v2-format +++ b/archivers/unshield/files/patch-unshield-v2-format @@ -1,6 +1,6 @@ ---- lib/component.c.orig +--- lib/component.c.orig 2005-06-28 18:49:36 UTC +++ lib/component.c -@@ -40,11 +40,13 @@ +@@ -40,11 +40,13 @@ UnshieldComponent* unshield_component_ne case 7: case 8: case 9: @@ -17,9 +17,9 @@ } self->file_group_count = READ_UINT16(p); p += 2; ---- lib/file.c.orig +--- lib/file.c.orig 2007-01-06 14:34:57 UTC +++ lib/file.c -@@ -77,6 +77,11 @@ +@@ -77,6 +77,11 @@ static FileDescriptor* unshield_read_fil case 7: case 8: case 9: @@ -31,7 +31,7 @@ saved_p = p = header->data + header->common.cab_descriptor_offset + header->cab.file_table_offset + -@@ -117,10 +122,6 @@ +@@ -117,10 +122,6 @@ static FileDescriptor* unshield_read_fil assert((p - saved_p) == 0x57); break; @@ -42,7 +42,7 @@ } if (!(fd->flags & FILE_COMPRESSED) && -@@ -363,6 +364,11 @@ +@@ -363,6 +364,11 @@ static bool unshield_reader_open_volume( case 7: case 8: case 9: @@ -54,7 +54,7 @@ { uint8_t six_header[VOLUME_HEADER_SIZE_V6]; uint8_t* p = six_header; -@@ -389,10 +395,6 @@ +@@ -389,10 +395,6 @@ static bool unshield_reader_open_volume( reader->volume_header.last_file_size_compressed_high = READ_UINT32(p); p += 4; } break; @@ -65,9 +65,9 @@ } #if VERBOSE >= 2 ---- lib/libunshield.c.orig +--- lib/libunshield.c.orig 2004-08-24 06:10:27 UTC +++ lib/libunshield.c -@@ -205,7 +205,7 @@ +@@ -205,7 +205,7 @@ static bool unshield_header_get_file_gro /** Read all header files */ @@ -76,7 +76,7 @@ { int i; bool iterate = true; -@@ -268,8 +268,21 @@ +@@ -268,8 +268,21 @@ static bool unshield_read_headers(Unshie unshield_error("Failed to read common header from header file %i", i); goto error; } @@ -100,7 +100,7 @@ #if 0 if (header->major_version < 5) -@@ -326,6 +339,11 @@ +@@ -326,6 +339,11 @@ error: Unshield* unshield_open(const char* filename)/*{{{*/ { @@ -112,7 +112,7 @@ Unshield* unshield = NEW1(Unshield); if (!unshield) { -@@ -339,7 +357,7 @@ +@@ -339,7 +357,7 @@ Unshield* unshield_open(const char* file goto error; } @@ -121,9 +121,9 @@ { unshield_error("Failed to read header files"); goto error; ---- lib/libunshield.h.orig +--- lib/libunshield.h.orig 2007-01-06 14:34:57 UTC +++ lib/libunshield.h -@@ -33,6 +33,7 @@ +@@ -33,6 +33,7 @@ void unshield_set_log_level(int level); */ Unshield* unshield_open(const char* filename); @@ -131,7 +131,7 @@ void unshield_close(Unshield* unshield); /* ---- man/unshield.1.orig +--- man/unshield.1.orig 2008-02-15 16:36:33 UTC +++ man/unshield.1 @@ -2,7 +2,7 @@ .SH NAME @@ -142,7 +142,7 @@ .SH DESCRIPTION Unshield extracts CAB files from InstallShield installers, used to install software on Microsoft Windows based machines. -@@ -27,6 +27,11 @@ +@@ -27,6 +27,11 @@ Only list/extract this file group \fB\-h\fR Show help message .TP @@ -154,9 +154,9 @@ \fB\-j\fR Junk paths (do not make directories) .TP ---- src/unshield.c.orig +--- src/unshield.c.orig 2009-06-18 05:11:31 UTC +++ src/unshield.c -@@ -58,6 +58,7 @@ +@@ -58,6 +58,7 @@ static OVERWRITE overwrite = static int log_level = UNSHIELD_LOG_LEVEL_LOWEST; static int exit_status = 0; static FORMAT format = FORMAT_NEW; @@ -164,7 +164,7 @@ static bool make_sure_directory_exists(const char* directory)/*{{{*/ { -@@ -108,7 +109,7 @@ +@@ -108,7 +109,7 @@ static void show_usage(const char* name) fprintf(stderr, "Syntax:\n" "\n" @@ -173,7 +173,7 @@ "\n" "Options:\n" "\t-c COMPONENT Only list/extract this component\n" -@@ -120,6 +121,7 @@ +@@ -120,6 +121,7 @@ static void show_usage(const char* name) "\t 3 - Errors, warnings and debug messages\n" "\t-g GROUP Only list/extract this file group\n" "\t-h Show this help message\n" @@ -181,7 +181,7 @@ "\t-j Junk paths (do not make directories)\n" "\t-L Make file and directory names lowercase\n" "\t-O Use old compression\n" -@@ -152,7 +154,7 @@ +@@ -152,7 +154,7 @@ static bool handle_parameters( { int c; @@ -190,7 +190,7 @@ { switch (c) { -@@ -172,6 +174,10 @@ +@@ -172,6 +174,10 @@ static bool handle_parameters( file_group_name = optarg; break; @@ -201,7 +201,7 @@ case 'j': junk_paths = true; break; -@@ -532,7 +538,7 @@ +@@ -532,7 +538,7 @@ int main(int argc, char** argv) cabfile = argv[last_optind]; diff --git a/archivers/untar/Makefile b/archivers/untar/Makefile index 2bf88c071798..bf4b366f2e23 100644 --- a/archivers/untar/Makefile +++ b/archivers/untar/Makefile @@ -21,7 +21,7 @@ MAKE_ENV+= PROG=untar NO_MAN=yes MAKE_ARGS+= CFLAGS="${CFLAGS} -D_POSIX_SOURCE" \ LDFLAGS="${LDFLAGS} -static" -pre-patch: +post-extract: @${CP} ${DISTDIR}/untar.c ${WRKSRC} do-install: diff --git a/archivers/untar/files/patch-untar.c b/archivers/untar/files/patch-untar.c index 760b6819c7a1..f65415ba1c2c 100644 --- a/archivers/untar/files/patch-untar.c +++ b/archivers/untar/files/patch-untar.c @@ -1,5 +1,5 @@ ---- untar.c.old 2010-03-19 22:39:55.000000000 +0100 -+++ untar.c 2010-03-19 22:36:01.000000000 +0100 +--- untar.c.orig 2016-07-26 12:43:54 UTC ++++ untar.c @@ -48,6 +48,9 @@ */ diff --git a/archivers/unzip/files/patch-crypt.c b/archivers/unzip/files/patch-crypt.c index 96d1c071a7a2..82fde67fda12 100644 --- a/archivers/unzip/files/patch-crypt.c +++ b/archivers/unzip/files/patch-crypt.c @@ -1,6 +1,6 @@ ---- crypt.c.orig 2007-01-05 16:47:36.000000000 +0100 -+++ crypt.c 2016-01-04 14:39:27.300502995 +0100 -@@ -465,7 +465,17 @@ +--- crypt.c.orig 2007-01-05 15:47:36 UTC ++++ crypt.c +@@ -465,7 +465,17 @@ int decrypt(__G__ passwrd) GLOBAL(pInfo->encrypted) = FALSE; defer_leftover_input(__G); for (n = 0; n < RAND_HEAD_LEN; n++) { diff --git a/archivers/unzip/files/patch-extract.c b/archivers/unzip/files/patch-extract.c index 63ad0548ad83..2d93b1c58b8e 100644 --- a/archivers/unzip/files/patch-extract.c +++ b/archivers/unzip/files/patch-extract.c @@ -1,5 +1,5 @@ ---- extract.c.orig 2009-03-14 02:32:52.000000000 +0100 -+++ extract.c 2016-01-04 14:43:11.813488458 +0100 +--- extract.c.orig 2009-03-14 01:32:52 UTC ++++ extract.c @@ -1,5 +1,5 @@ /* - Copyright (c) 1990-2009 Info-ZIP. All rights reserved. @@ -7,7 +7,7 @@ See the accompanying file LICENSE, version 2009-Jan-02 or later (the contents of which are also included in unzip.h) for terms of use. -@@ -298,6 +298,8 @@ +@@ -298,6 +298,8 @@ char ZCONST Far TruncNTSD[] = #ifndef SFX static ZCONST char Far InconsistEFlength[] = "bad extra-field entry:\n \ EF block length (%u bytes) exceeds remaining EF data (%u bytes)\n"; @@ -16,7 +16,7 @@ static ZCONST char Far InvalidComprDataEAs[] = " invalid compressed data for EAs\n"; # if (defined(WIN32) && defined(NTSD_EAS)) -@@ -2023,7 +2025,8 @@ +@@ -2023,7 +2025,8 @@ static int TestExtraField(__G__ ef, ef_l ebID = makeword(ef); ebLen = (unsigned)makeword(ef+EB_LEN); @@ -26,7 +26,7 @@ /* Discovered some extra field inconsistency! */ if (uO.qflag) Info(slide, 1, ((char *)slide, "%-22s ", -@@ -2032,6 +2035,16 @@ +@@ -2032,6 +2035,16 @@ static int TestExtraField(__G__ ef, ef_l ebLen, (ef_len - EB_HEADSIZE))); return PK_ERR; } @@ -43,7 +43,7 @@ switch (ebID) { case EF_OS2: -@@ -2217,14 +2230,28 @@ +@@ -2217,14 +2230,28 @@ static int test_compr_eb(__G__ eb, eb_si ulg eb_ucsize; uch *eb_ucptr; int r; @@ -75,7 +75,7 @@ if ( #ifdef INT_16BIT -@@ -2701,6 +2728,12 @@ +@@ -2701,6 +2728,12 @@ __GDEF int repeated_buf_err; bz_stream bstrm; diff --git a/archivers/unzoo/files/patch-unzoo.c b/archivers/unzoo/files/patch-unzoo.c index c111a57e6c0e..71c65ca53ec3 100644 --- a/archivers/unzoo/files/patch-unzoo.c +++ b/archivers/unzoo/files/patch-unzoo.c @@ -1,20 +1,20 @@ ---- unzoo.c.orig Sat Nov 25 00:53:57 2006 -+++ unzoo.c Sat Nov 25 01:00:42 2006 -@@ -2590,20 +2590,20 @@ +--- unzoo.c.orig 2016-07-26 12:44:10 UTC ++++ unzoo.c +@@ -2590,20 +2590,20 @@ int ExtrArch ( bim, out, ovr /* but only if the user did not request otherwise */ - + /* building the universal path of this member */ + int found_trav = 0; char patu [sizeof(Entry.diru) + sizeof(Entry.namu) + 2]; strcpy( patu, Entry.diru ); if ( strlen(patu) && patu[strlen(patu)-1] != '/') strcat( patu, "/" ); strcat( patu, (Entry.lnamu ? Entry.namu : Entry.nams) ); - + - int found_trav = 0; - + if ( strstr( patu, "/../" )) { - found_trav = 1; - + /* remove "/../" from the path */ char tmp [sizeof(patu)]; char *p; @@ -22,25 +22,25 @@ + found_trav = 1; memset(tmp, 0, sizeof(tmp)); q = patu; - -@@ -2625,10 +2625,10 @@ + +@@ -2625,10 +2625,10 @@ int ExtrArch ( bim, out, ovr printf("unzoo: skipped \"/../\" path component(s) in '%s'\n", Entry.patl); } if ( *patu == '/' && !strlen( pre ) ) { - found_trav = 1; - + char *p = malloc(sizeof(patu)); char *q = p; + found_trav = 1; memset(p, 0, sizeof(patu)); strcpy(p, patu); while ( q[0] == '/' ) q++; -@@ -2638,9 +2638,9 @@ +@@ -2638,9 +2638,9 @@ int ExtrArch ( bim, out, ovr printf("unzoo: skipped root directory path component in '%s'\n", patl); } if ( !strncmp( patu, "../", 3 )) { - found_trav = 1; - + char tmp [sizeof(patu)]; + found_trav = 1; memset(tmp, 0, sizeof(tmp)); diff --git a/archivers/upx/files/patch-src-Makefile b/archivers/upx/files/patch-src_Makefile similarity index 61% rename from archivers/upx/files/patch-src-Makefile rename to archivers/upx/files/patch-src_Makefile index ff98a0bb4671..17c9907cfea8 100644 --- a/archivers/upx/files/patch-src-Makefile +++ b/archivers/upx/files/patch-src_Makefile @@ -1,6 +1,6 @@ ---- src/Makefile.orig Fri Apr 27 15:00:00 2007 -+++ src/Makefile Wed May 9 22:55:18 2007 -@@ -52,7 +52,7 @@ +--- src/Makefile.orig 2013-09-30 15:51:00 UTC ++++ src/Makefile +@@ -55,7 +55,7 @@ upx_OBJECTS := $(notdir $(upx_SOURCES:.c # we need UCL and zlib - you can set envvar UPX_UCLDIR ifneq ($(wildcard $(UPX_UCLDIR)/include/ucl/ucl.h),) INCLUDES += -I$(UPX_UCLDIR)/include @@ -8,4 +8,4 @@ +LIBS += -L$(UPX_UCLDIR)/lib endif LIBS += -lucl -lz - # you should set envvar UPX_LZMADIR to point to your unpacked lzma443.tar.bz2 + # you should set envvar UPX_LZMADIR to point to your unpacked LZMA SDK diff --git a/archivers/upx/files/patch-src-miniacc.h b/archivers/upx/files/patch-src_miniacc.h similarity index 100% rename from archivers/upx/files/patch-src-miniacc.h rename to archivers/upx/files/patch-src_miniacc.h diff --git a/archivers/upx/files/patch-src-packer.h b/archivers/upx/files/patch-src_packer.h similarity index 74% rename from archivers/upx/files/patch-src-packer.h rename to archivers/upx/files/patch-src_packer.h index c16901d55891..d99e08bd955b 100644 --- a/archivers/upx/files/patch-src-packer.h +++ b/archivers/upx/files/patch-src_packer.h @@ -1,6 +1,6 @@ ---- src/packer.h.orig 2011-12-13 00:08:00.000000000 +0800 -+++ src/packer.h 2012-01-06 04:41:44.771998330 +0800 -@@ -235,7 +235,7 @@ +--- src/packer.h.orig 2013-09-30 15:51:00 UTC ++++ src/packer.h +@@ -238,7 +238,7 @@ protected: void addLoader(C,C,C,C,C,C,C,C); void addLoader(C,C,C,C,C,C,C,C,C); void addLoader(C,C,C,C,C,C,C,C,C,C); #undef C diff --git a/archivers/xarchive/files/patch-doc-Makefile.in b/archivers/xarchive/files/patch-doc-Makefile.in deleted file mode 100644 index 538f1296b1f8..000000000000 --- a/archivers/xarchive/files/patch-doc-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- ./doc/Makefile.in.orig Wed May 17 08:42:06 2006 -+++ ./doc/Makefile.in Wed May 17 08:42:32 2006 -@@ -234,7 +234,7 @@ - - info-am: - --install-data-am: install-docDATA install-man -+install-data-am: install-man - - install-exec-am: - diff --git a/archivers/xarchive/files/patch-doc_Makefile.in b/archivers/xarchive/files/patch-doc_Makefile.in new file mode 100644 index 000000000000..1e9bc5a21a1a --- /dev/null +++ b/archivers/xarchive/files/patch-doc_Makefile.in @@ -0,0 +1,11 @@ +--- doc/Makefile.in.orig 2006-02-27 17:29:16 UTC ++++ doc/Makefile.in +@@ -234,7 +234,7 @@ info: info-am + + info-am: + +-install-data-am: install-docDATA install-man ++install-data-am: install-man + + install-exec-am: + diff --git a/archivers/xarchive/files/patch-src-main.c b/archivers/xarchive/files/patch-src_main.c similarity index 56% rename from archivers/xarchive/files/patch-src-main.c rename to archivers/xarchive/files/patch-src_main.c index 0e1363951367..7138e8a0c1f1 100644 --- a/archivers/xarchive/files/patch-src-main.c +++ b/archivers/xarchive/files/patch-src_main.c @@ -1,6 +1,6 @@ ---- src/main.c.orig Sun Nov 6 21:26:45 2005 -+++ src/main.c Sun Nov 13 02:57:57 2005 -@@ -115,6 +115,7 @@ +--- src/main.c.orig 2006-02-23 17:25:47 UTC ++++ src/main.c +@@ -115,6 +115,7 @@ setup_wrappers(void) WrapperEntry *wrapent = NULL; home = g_strdup_printf("%s/.xarchive/wrappers", getenv("HOME")); @@ -8,11 +8,11 @@ char *dir[] = { home, -@@ -145,6 +146,7 @@ - if (WRAPPER_ARRAY == NULL) +@@ -146,6 +147,7 @@ setup_wrappers(void) { g_print("No wrappers found\n"); -+ } } ++ } } + extern gchar * diff --git a/archivers/xarchive/files/patch-src-widgets_gtk.c b/archivers/xarchive/files/patch-src_widgets__gtk.c similarity index 73% rename from archivers/xarchive/files/patch-src-widgets_gtk.c rename to archivers/xarchive/files/patch-src_widgets__gtk.c index 58beeb2624d5..b0125309f4b4 100644 --- a/archivers/xarchive/files/patch-src-widgets_gtk.c +++ b/archivers/xarchive/files/patch-src_widgets__gtk.c @@ -1,6 +1,6 @@ ---- src/widgets_gtk.c.orig Tue Nov 8 20:39:01 2005 -+++ src/widgets_gtk.c Sun Nov 13 03:03:53 2005 -@@ -1022,8 +1022,9 @@ +--- src/widgets_gtk.c.orig 2006-02-27 14:00:30 UTC ++++ src/widgets_gtk.c +@@ -1131,8 +1131,9 @@ open_one_file(WrapperData *wrapper, gcha if (wrapper_cmd(AR_EXTRACT, wrapper->argv, wrapper->dir) == 0) { diff --git a/archivers/xarchiver/files/patch-src_bzip2.c b/archivers/xarchiver/files/patch-src_bzip2.c index 4471a049a328..debaa115fbfe 100644 --- a/archivers/xarchiver/files/patch-src_bzip2.c +++ b/archivers/xarchiver/files/patch-src_bzip2.c @@ -1,6 +1,6 @@ ---- src/bzip2.c.orig 2014-02-09 15:26:24 UTC +--- src/bzip2.c.orig 2016-07-19 21:54:07 UTC +++ src/bzip2.c -@@ -171,11 +171,11 @@ void xa_open_tar_compressed_file(XArchiv +@@ -176,11 +176,11 @@ void xa_open_tar_compressed_file(XArchiv if (archive->type == XARCHIVETYPE_TAR_BZ2) command = g_strconcat(tar," tfjv ",archive->escaped_path,NULL); else if (archive->type == XARCHIVETYPE_TAR_LZMA) diff --git a/archivers/xarchiver/files/patch-src_tar.c b/archivers/xarchiver/files/patch-src_tar.c index 1e97ef7408b8..3722360be86b 100644 --- a/archivers/xarchiver/files/patch-src_tar.c +++ b/archivers/xarchiver/files/patch-src_tar.c @@ -1,6 +1,6 @@ ---- src/tar.c.orig 2016-03-09 15:25:48 UTC +--- src/tar.c.orig 2016-07-19 21:54:07 UTC +++ src/tar.c -@@ -330,7 +330,7 @@ gboolean xa_tar_extract(XArchive *archiv +@@ -334,7 +334,7 @@ gboolean xa_tar_extract(XArchive *archiv #else archive->overwrite ? " --overwrite" : " --keep-old-files", #endif @@ -9,7 +9,7 @@ " -C ",archive->extraction_path," ",names->str,NULL); } else -@@ -349,7 +349,7 @@ gboolean xa_tar_extract(XArchive *archiv +@@ -353,7 +353,7 @@ gboolean xa_tar_extract(XArchive *archiv #else archive->overwrite ? " --overwrite" : " --keep-old-files", #endif @@ -18,7 +18,7 @@ " -C ",archive->extraction_path," ",names->str,NULL); } else -@@ -368,7 +368,7 @@ gboolean xa_tar_extract(XArchive *archiv +@@ -372,7 +372,7 @@ gboolean xa_tar_extract(XArchive *archiv #else archive->overwrite ? " --overwrite" : " --keep-old-files", #endif @@ -27,7 +27,7 @@ " -C ",archive->extraction_path," ",names->str,NULL); } else -@@ -387,7 +387,7 @@ gboolean xa_tar_extract(XArchive *archiv +@@ -391,7 +391,7 @@ gboolean xa_tar_extract(XArchive *archiv #else archive->overwrite ? " --overwrite" : " --keep-old-files", #endif @@ -36,7 +36,7 @@ " -C ",archive->extraction_path," ",names->str,NULL); } else -@@ -406,7 +406,7 @@ gboolean xa_tar_extract(XArchive *archiv +@@ -410,7 +410,7 @@ gboolean xa_tar_extract(XArchive *archiv #else archive->overwrite ? " --overwrite" : " --keep-old-files", #endif @@ -45,7 +45,7 @@ " -C ",archive->extraction_path," ",names->str,NULL); } else -@@ -425,7 +425,7 @@ gboolean xa_tar_extract(XArchive *archiv +@@ -429,7 +429,7 @@ gboolean xa_tar_extract(XArchive *archiv #else archive->overwrite ? " --overwrite" : " --keep-old-files", #endif diff --git a/archivers/xarchiver/files/patch-src_window.c b/archivers/xarchiver/files/patch-src_window.c index 9b2fe011bf0f..6d7f91b64490 100644 --- a/archivers/xarchiver/files/patch-src_window.c +++ b/archivers/xarchiver/files/patch-src_window.c @@ -1,6 +1,6 @@ ---- src/window.c.orig 2014-09-28 20:42:37 UTC +--- src/window.c.orig 2016-07-19 21:54:07 UTC +++ src/window.c -@@ -1130,7 +1130,7 @@ XArchiveType xa_detect_archive_type (gch +@@ -1181,7 +1181,7 @@ XArchiveType xa_detect_archive_type (gch xx = XARCHIVETYPE_BZIP2; else if (memcmp ( magic,"\x1f\x8b",2) == 0 || memcmp ( magic,"\x1f\x9d",2) == 0) xx = XARCHIVETYPE_GZIP; diff --git a/archivers/xmill/files/patch-XMill+BZlib.cpp b/archivers/xmill/files/patch-XMill_BZlib.cpp similarity index 85% rename from archivers/xmill/files/patch-XMill+BZlib.cpp rename to archivers/xmill/files/patch-XMill_BZlib.cpp index 24c25114c64e..95cd778a6d35 100644 --- a/archivers/xmill/files/patch-XMill+BZlib.cpp +++ b/archivers/xmill/files/patch-XMill_BZlib.cpp @@ -1,6 +1,6 @@ ---- XMill/BZlib.cpp.orig 2008-07-26 04:10:15.000000000 +0700 -+++ XMill/BZlib.cpp 2008-07-26 04:20:22.000000000 +0700 -@@ -44,7 +44,7 @@ +--- XMill/BZlib.cpp.orig 2016-07-26 12:48:05 UTC ++++ XMill/BZlib.cpp +@@ -44,7 +44,7 @@ BZip::~BZip() void BZip::initCompress() { @@ -9,7 +9,7 @@ throw new XMillException (XMILL_ERR_ZLIB, "Error while compressing container!"); } } -@@ -60,19 +60,19 @@ +@@ -60,19 +60,19 @@ int BZip::doCompress(int flag) { if (flag == -1) flag = BZ_FINISH; @@ -32,7 +32,7 @@ throw new XMillException (XMILL_ERR_ZLIB, "Error while uncompressing container!"); } } -@@ -106,7 +106,7 @@ +@@ -106,7 +106,7 @@ char **BZip::getNextInPtr() void BZip::endUncompress() { @@ -41,7 +41,7 @@ throw new XMillException (XMILL_ERR_ZLIB, "Error while uncompressing container!"); } } -@@ -138,22 +138,24 @@ +@@ -138,22 +138,24 @@ int* BZip::getAvailOutPtr() int BZip::getTotalOut() { diff --git a/archivers/xmill/files/patch-XMill-CompressMan.cpp b/archivers/xmill/files/patch-XMill_CompressMan.cpp similarity index 65% rename from archivers/xmill/files/patch-XMill-CompressMan.cpp rename to archivers/xmill/files/patch-XMill_CompressMan.cpp index 4e281515351e..c64b68dd77ef 100644 --- a/archivers/xmill/files/patch-XMill-CompressMan.cpp +++ b/archivers/xmill/files/patch-XMill_CompressMan.cpp @@ -1,6 +1,6 @@ ---- XMill/CompressMan.cpp.orig 2009-03-13 19:11:05.000000000 +0100 -+++ XMill/CompressMan.cpp 2009-03-13 19:11:08.000000000 +0100 -@@ -423,7 +423,7 @@ +--- XMill/CompressMan.cpp.orig 2016-07-26 12:48:05 UTC ++++ XMill/CompressMan.cpp +@@ -423,7 +423,7 @@ void BothCompressMan::DebugPrint() UserCompressorFactory *compressor=compressorlist; while(compressor!=NULL) { diff --git a/archivers/xmill/files/patch-XMill-PPMDI.cpp b/archivers/xmill/files/patch-XMill_PPMDI.cpp similarity index 52% rename from archivers/xmill/files/patch-XMill-PPMDI.cpp rename to archivers/xmill/files/patch-XMill_PPMDI.cpp index a2b72a53cc78..0340d73155f1 100644 --- a/archivers/xmill/files/patch-XMill-PPMDI.cpp +++ b/archivers/xmill/files/patch-XMill_PPMDI.cpp @@ -1,6 +1,6 @@ ---- XMill/PPMDI.cpp.orig 2009-03-13 19:12:05.000000000 +0100 -+++ XMill/PPMDI.cpp 2009-03-13 19:12:29.000000000 +0100 -@@ -245,7 +245,7 @@ +--- XMill/PPMDI.cpp.orig 2016-07-26 12:48:05 UTC ++++ XMill/PPMDI.cpp +@@ -245,7 +245,7 @@ int PPMDI::uncompress(unsigned char *dst cleanup: *outused = j; diff --git a/archivers/xmill/files/patch-makefile b/archivers/xmill/files/patch-makefile index 7a9d3b94641d..fd8d9379de09 100644 --- a/archivers/xmill/files/patch-makefile +++ b/archivers/xmill/files/patch-makefile @@ -1,22 +1,21 @@ ---- makefile.orig 2008-07-26 04:10:14.000000000 +0700 -+++ makefile 2008-07-26 04:08:44.000000000 +0700 -@@ -43,25 +43,18 @@ +--- makefile.orig 2016-07-26 12:48:05 UTC ++++ makefile +@@ -43,25 +43,18 @@ INSPECTSRC = ./xmillinspect PPMZIPSRC = ./ppmzip PPMSRC = ./ppmdi -CPP = g++ -CC = gcc -LINK = g++ -- ++CPP = $(CXX) ++CC = $(CC) ++LINK = $(CPP) + -CFLAGS = -O3 -c -w -CPPFLAGS_XMILL = $(CFLAGS) -DXMILL -Izlib -Ibzlib -IXMill -Ippmdi -CPPFLAGS_XDEMILL = $(CFLAGS) -Izlib -Ibzlib -DXDEMILL -Ippmdi -CPPFLAGS_XMILLTEST = $(CFLAGS) -IXMill -CPPFLAGS_PPMZIP = $(CFLAGS) -Ippmdi -+CPP = $(CXX) -+CC = $(CC) -+LINK = $(CPP) -+ +CPPFLAGS = $(CXXFLAGS) -c -w +CPPFLAGS_XMILL = $(CPPFLAGS) -DXMILL -IXMill -Ippmdi +CPPFLAGS_XDEMILL = $(CPPFLAGS) -DXDEMILL -Ippmdi @@ -35,7 +34,7 @@ XMILLLIB_MISC = \ $(TMP)/CompressMan.o $(TMP)/ContMan.o $(TMP)/PathDict.o \ $(TMP)/UnCompCont.o \ -@@ -120,9 +113,9 @@ +@@ -120,9 +113,9 @@ XMILL_OBJSPART = $(TMP)/realmain.o $(TMP XDEMILL_OBJSPART = $(TMP)/realmain_u.o $(TMP)/Options_u.o XMILLTEST_OBJSPART = $(TMP)/testset.o $(TMP)/xmilltest.o @@ -48,7 +47,7 @@ XMILLINSPECTOBJS = $(TMP)/containers.o $(TMP)/exprinfo.o \ $(TMP)/globals.o \ -@@ -131,27 +124,27 @@ +@@ -131,27 +124,27 @@ XMILLINSPECTOBJS = $(TMP)/containers.o $ $(TMP)/lists.o \ $(TMP)/main.o \ $(TMP)/xmillinspect.o \ diff --git a/archivers/xpk/files/patch-shell_xQuery.c b/archivers/xpk/files/patch-shell_xQuery.c index 99c50170eb10..81b00012d456 100644 --- a/archivers/xpk/files/patch-shell_xQuery.c +++ b/archivers/xpk/files/patch-shell_xQuery.c @@ -1,5 +1,5 @@ ---- shell/xQuery.c.orig 2011-12-22 00:24:32.000000000 +0800 -+++ shell/xQuery.c 2011-12-22 00:24:43.000000000 +0800 +--- shell/xQuery.c.orig 2000-04-15 00:37:42 UTC ++++ shell/xQuery.c @@ -83,7 +83,7 @@ void packerquery(unsigned int packerid) printf("\n"); } diff --git a/archivers/zip/files/patch-man__zipcloak.1 b/archivers/zip/files/patch-man_zipcloak.1 similarity index 73% rename from archivers/zip/files/patch-man__zipcloak.1 rename to archivers/zip/files/patch-man_zipcloak.1 index 98726b738dc4..21d0c1906c11 100644 --- a/archivers/zip/files/patch-man__zipcloak.1 +++ b/archivers/zip/files/patch-man_zipcloak.1 @@ -1,6 +1,6 @@ --- man/zipcloak.1.orig 2008-05-08 08:18:46 UTC +++ man/zipcloak.1 -@@ -12,8 +12,6 @@ +@@ -12,8 +12,6 @@ zipcloak \- encrypt entries in a zipfile zipfile .SH ARGUMENTS diff --git a/archivers/zip/files/patch-man__zipnote.1 b/archivers/zip/files/patch-man_zipnote.1 similarity index 74% rename from archivers/zip/files/patch-man__zipnote.1 rename to archivers/zip/files/patch-man_zipnote.1 index 15d2b1c85f25..612f292e17a1 100644 --- a/archivers/zip/files/patch-man__zipnote.1 +++ b/archivers/zip/files/patch-man_zipnote.1 @@ -1,6 +1,6 @@ --- man/zipnote.1.orig 2008-05-08 08:17:56 UTC +++ man/zipnote.1 -@@ -12,8 +12,6 @@ +@@ -12,8 +12,6 @@ zipnote \- write the comments in zipfile zipfile .SH ARGUMENTS diff --git a/archivers/zip/files/patch-man__zipsplit.1 b/archivers/zip/files/patch-man_zipsplit.1 similarity index 72% rename from archivers/zip/files/patch-man__zipsplit.1 rename to archivers/zip/files/patch-man_zipsplit.1 index 196a53b6d89d..5006951e9cc2 100644 --- a/archivers/zip/files/patch-man__zipsplit.1 +++ b/archivers/zip/files/patch-man_zipsplit.1 @@ -1,6 +1,6 @@ --- man/zipsplit.1.orig 2008-05-08 08:17:48 UTC +++ man/zipsplit.1 -@@ -17,8 +17,6 @@ +@@ -17,8 +17,6 @@ zipsplit \- split a zipfile into smaller zipfile .SH ARGUMENTS diff --git a/archivers/zip/files/patch-unix_Makefile b/archivers/zip/files/patch-unix_Makefile index c466c97973f2..f60637ff31d0 100644 --- a/archivers/zip/files/patch-unix_Makefile +++ b/archivers/zip/files/patch-unix_Makefile @@ -1,6 +1,6 @@ ---- unix/Makefile.orig 2008-05-07 02:33:56.000000000 +0400 -+++ unix/Makefile 2008-08-03 06:36:20.000000000 +0400 -@@ -22,7 +22,6 @@ +--- unix/Makefile.orig 2008-05-07 06:33:56 UTC ++++ unix/Makefile +@@ -22,7 +22,6 @@ SHELL = /bin/sh LN = ln -s # (to use the GNU compiler, change cc to gcc in CC) @@ -8,7 +8,7 @@ BIND = $(CC) AS = $(CC) -c CPP = /lib/cpp -@@ -57,8 +56,7 @@ +@@ -57,8 +56,7 @@ IZ_OUR_BZIP2_DIR = bzip2 # CFLAGS flags for C compile # LFLAGS1 flags after output file spec, before obj file list # LFLAGS2 flags after obj file list (libraries, etc) diff --git a/archivers/zip/files/patch-unix_configure b/archivers/zip/files/patch-unix_configure index adcc2c41e3cf..3e421f3ffba6 100644 --- a/archivers/zip/files/patch-unix_configure +++ b/archivers/zip/files/patch-unix_configure @@ -1,6 +1,6 @@ ---- unix/configure.orig 2008-06-19 23:32:20.000000000 +0400 -+++ unix/configure 2008-08-03 06:35:03.000000000 +0400 -@@ -98,7 +98,6 @@ +--- unix/configure.orig 2008-06-20 03:32:20 UTC ++++ unix/configure +@@ -98,7 +98,6 @@ int main() _EOF_ $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null if test $? -eq 0; then @@ -8,7 +8,7 @@ echo " GNU C ($CFLAGS_OPT)" # Special Mac OS X shared library "ld" option? if test ` uname -s 2> /dev/null ` = 'Darwin'; then -@@ -110,7 +109,6 @@ +@@ -110,7 +109,6 @@ _EOF_ rm -f conftest fi else @@ -16,7 +16,7 @@ echo " Other-unknown C ($CFLAGS_OPT)" fi fi -@@ -224,7 +222,6 @@ +@@ -224,7 +222,6 @@ CPP="${CC} -E" [ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P" [ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp [ -f /lib/cpp ] && CPP=/lib/cpp @@ -24,7 +24,7 @@ [ -f /xenix ] && CPP="${CC} -E" [ -f /lynx.os ] && CPP="${CC} -E" -@@ -244,7 +241,7 @@ +@@ -244,7 +241,7 @@ if eval "$CPP match.S > _match.s 2>/dev/ echo "int foo() { return 0;}" > conftest.c $CC -c conftest.c >/dev/null 2>/dev/null echo Check if compiler generates underlines diff --git a/archivers/zipmix/files/patch-zipmix.c b/archivers/zipmix/files/patch-zipmix.c index bbf0d282f065..a27591fa426d 100644 --- a/archivers/zipmix/files/patch-zipmix.c +++ b/archivers/zipmix/files/patch-zipmix.c @@ -1,5 +1,5 @@ ---- zipmix.c.orig 2013-05-27 12:33:32.795062151 +0200 -+++ zipmix.c 2013-05-27 12:33:52.048486869 +0200 +--- zipmix.c.orig 2016-07-26 12:48:42 UTC ++++ zipmix.c @@ -4,6 +4,17 @@ zipmix.exe: zipmix.c; cl zipmix.c /O1 /G !if 0 #endif diff --git a/archivers/zoo/files/patch-ar.h b/archivers/zoo/files/patch-ar.h index fbc3ec644a2d..0acf929a0b65 100644 --- a/archivers/zoo/files/patch-ar.h +++ b/archivers/zoo/files/patch-ar.h @@ -1,6 +1,6 @@ ---- ./ar.h.orig 1993-05-01 06:04:22.000000000 +0200 -+++ ./ar.h 2011-12-22 14:00:55.000000000 +0100 -@@ -15,10 +15,12 @@ +--- ar.h.orig 1993-05-01 04:04:22 UTC ++++ ar.h +@@ -15,10 +15,12 @@ Adapted from "ar" archiver written by Ha /* uchar should be 8 bits or more */ /* typedef unsigned char uchar; -- already in zoo.h */ diff --git a/archivers/zoo/files/patch-bsd.c b/archivers/zoo/files/patch-bsd.c index bcb7712b7f3f..bc76a076e8a6 100644 --- a/archivers/zoo/files/patch-bsd.c +++ b/archivers/zoo/files/patch-bsd.c @@ -1,6 +1,6 @@ ---- ./bsd.c.orig 1993-05-01 06:21:53.000000000 +0200 -+++ ./bsd.c 2011-12-22 14:00:55.000000000 +0100 -@@ -69,8 +69,12 @@ +--- bsd.c.orig 1993-05-01 04:21:53 UTC ++++ bsd.c +@@ -69,8 +69,12 @@ ZOOFILE f; } /* Function gettz() returns the offset from GMT in seconds */ @@ -14,7 +14,7 @@ #define SEC_IN_DAY (24L * 60L * 60L) #define INV_VALUE (SEC_IN_DAY + 1L) static long retval = INV_VALUE; /* cache, init to impossible value */ -@@ -95,6 +99,7 @@ +@@ -95,6 +99,7 @@ long gettz() retval = -tm->tm_gmtoff; #endif return retval; @@ -22,7 +22,7 @@ } /* Standard UNIX-compatible time routines */ -@@ -103,15 +108,19 @@ +@@ -103,15 +108,19 @@ long gettz() /* Standard UNIX-specific file attribute routines */ #include "nixmode.i" diff --git a/archivers/zoo/files/patch-makefile b/archivers/zoo/files/patch-makefile index 18ec3e7caabd..50ddafa118df 100644 --- a/archivers/zoo/files/patch-makefile +++ b/archivers/zoo/files/patch-makefile @@ -1,5 +1,5 @@ ---- ./makefile.orig 1991-07-16 17:52:08.000000000 +0200 -+++ ./makefile 2011-12-22 14:00:55.000000000 +0100 +--- makefile.orig 1991-07-16 15:52:08 UTC ++++ makefile @@ -18,13 +18,13 @@ MAKE = make # needed for some systems e.g. older BSD @@ -18,7 +18,7 @@ #List of all object files created for Zoo ZOOOBJS = addbfcrc.o addfname.o basename.o comment.o crcdefs.o \ -@@ -67,7 +67,7 @@ +@@ -67,7 +67,7 @@ help : @echo "lint_turboc: Run lint under **IX for checking Turbo C/MSDOS code" # install alpha zoo as "tzoo" @@ -27,7 +27,7 @@ mv zoo $(DESTDIR)/tzoo # install beta zoo as "bzoo" -@@ -75,8 +75,9 @@ +@@ -75,8 +75,9 @@ inst_beta: mv zoo $(DESTDIR)/bzoo # install production zoo as "zoo" diff --git a/archivers/zoo/files/patch-misc.c b/archivers/zoo/files/patch-misc.c index a613087b3a10..65d744f73632 100644 --- a/archivers/zoo/files/patch-misc.c +++ b/archivers/zoo/files/patch-misc.c @@ -1,6 +1,6 @@ ---- ./misc.c.orig 1991-07-16 17:52:54.000000000 +0200 -+++ ./misc.c 2011-12-22 14:02:23.000000000 +0100 -@@ -135,11 +135,16 @@ +--- misc.c.orig 1991-07-16 15:52:54 UTC ++++ misc.c +@@ -135,11 +135,16 @@ if available, else the short filename is char *fullpath (direntry) struct direntry *direntry; { @@ -18,7 +18,7 @@ return (result); } -@@ -172,7 +177,11 @@ +@@ -172,7 +177,11 @@ int preserve; frd_zooh (header, zoo_file); diff --git a/archivers/zoo/files/patch-misc2.c b/archivers/zoo/files/patch-misc2.c index de3595ab5713..b4be82fc4f96 100644 --- a/archivers/zoo/files/patch-misc2.c +++ b/archivers/zoo/files/patch-misc2.c @@ -1,6 +1,6 @@ ---- ./misc2.c.orig 1991-07-16 17:53:02.000000000 +0200 -+++ ./misc2.c 2011-12-22 14:00:55.000000000 +0100 -@@ -314,10 +314,12 @@ +--- misc2.c.orig 1991-07-16 15:53:02 UTC ++++ misc2.c +@@ -314,10 +314,12 @@ struct direntry *direntry; { long diff_tz; long longtime; diff --git a/archivers/zoo/files/patch-nixtime.i b/archivers/zoo/files/patch-nixtime.i index d536387bd063..2c1d2c1e1859 100644 --- a/archivers/zoo/files/patch-nixtime.i +++ b/archivers/zoo/files/patch-nixtime.i @@ -1,6 +1,6 @@ ---- ./nixtime.i.orig 1991-07-16 17:53:46.000000000 +0200 -+++ ./nixtime.i 2011-12-22 14:00:55.000000000 +0100 -@@ -52,7 +52,8 @@ +--- nixtime.i.orig 1991-07-16 15:53:46 UTC ++++ nixtime.i +@@ -52,7 +52,8 @@ unsigned int date, time; long mstonix(); long gettz(); long utimbuf[2]; diff --git a/archivers/zoo/files/patch-options.h b/archivers/zoo/files/patch-options.h index 3749d82708d3..5dad8f4b2f74 100644 --- a/archivers/zoo/files/patch-options.h +++ b/archivers/zoo/files/patch-options.h @@ -1,6 +1,6 @@ ---- ./options.h.orig 1993-05-01 06:27:59.000000000 +0200 -+++ ./options.h 2011-12-22 14:00:55.000000000 +0100 -@@ -96,7 +96,6 @@ +--- options.h.orig 1993-05-01 04:27:59 UTC ++++ options.h +@@ -96,7 +96,6 @@ For documentation about this file, see o #define NIXTIME #define NIXFNAME #define NEEDCTYP @@ -8,7 +8,7 @@ #define REN_STDC #define SETBUF #define GETTZ -@@ -110,6 +109,7 @@ +@@ -110,6 +109,7 @@ For documentation about this file, see o #define ANSI_PROTO #define VOIDPTR void * #else diff --git a/archivers/zoo/files/patch-zooadd2.c b/archivers/zoo/files/patch-zooadd2.c index 247acb84de6c..be9cc6d6cff1 100644 --- a/archivers/zoo/files/patch-zooadd2.c +++ b/archivers/zoo/files/patch-zooadd2.c @@ -1,6 +1,6 @@ ---- ./zooadd2.c.orig 1991-07-20 01:38:10.000000000 +0200 -+++ ./zooadd2.c 2011-12-22 14:00:55.000000000 +0100 -@@ -258,12 +258,15 @@ +--- zooadd2.c.orig 1991-07-19 23:38:10 UTC ++++ zooadd2.c +@@ -258,12 +258,15 @@ void newdir (direntry) register struct direntry *direntry; { #ifdef GETTZ diff --git a/archivers/zoo/files/patch-zooext.c b/archivers/zoo/files/patch-zooext.c index 1553286201f9..a8c85f2b682e 100644 --- a/archivers/zoo/files/patch-zooext.c +++ b/archivers/zoo/files/patch-zooext.c @@ -1,6 +1,6 @@ ---- ./zooext.c.orig 1993-05-01 05:58:50.000000000 +0200 -+++ ./zooext.c 2011-12-22 14:03:37.000000000 +0100 -@@ -163,7 +163,11 @@ +--- zooext.c.orig 1993-05-01 03:58:50 UTC ++++ zooext.c +@@ -163,7 +163,11 @@ if (fiz_ofs != 0L) { /* i } else { /* read header */ frd_zooh (&zoo_header, zoo_file); @@ -12,7 +12,7 @@ prterror ('w', failed_consistency); bad_header++; exit_status = 1; -@@ -184,7 +188,8 @@ +@@ -184,7 +188,8 @@ if (null_device) { this_file = STDOUT; /* standard output */ while (1) { diff --git a/archivers/zoo/files/patch-zoofns.h b/archivers/zoo/files/patch-zoofns.h index c51cfcb3dbed..693da9df2cf4 100644 --- a/archivers/zoo/files/patch-zoofns.h +++ b/archivers/zoo/files/patch-zoofns.h @@ -1,6 +1,6 @@ ---- ./zoofns.h.orig 1993-05-01 05:57:35.000000000 +0200 -+++ ./zoofns.h 2011-12-22 14:00:55.000000000 +0100 -@@ -94,7 +94,11 @@ +--- zoofns.h.orig 1993-05-01 03:57:35 UTC ++++ zoofns.h +@@ -94,7 +94,11 @@ void exit PARMS ((int)); void fixslash PARMS ((char *)); void makelist PARMS ((int, char *[], char *[], int, char *, char *, char *, int *)); void memerr PARMS ((unsigned int)); diff --git a/archivers/zoo/files/patch-zoolist.c b/archivers/zoo/files/patch-zoolist.c index 339b3bdb14c6..b61d9938297f 100644 --- a/archivers/zoo/files/patch-zoolist.c +++ b/archivers/zoo/files/patch-zoolist.c @@ -1,6 +1,6 @@ ---- ./zoolist.c.orig 1991-07-20 00:57:27.000000000 +0200 -+++ ./zoolist.c 2011-12-22 14:00:55.000000000 +0100 -@@ -539,10 +539,12 @@ +--- zoolist.c.orig 1991-07-19 22:57:27 UTC ++++ zoolist.c +@@ -539,10 +539,12 @@ int file_tz; { long gettz(); int diff_tz; /* timezone difference */ diff --git a/astro/astrometry/files/patch-cairoutils.c b/astro/astrometry/files/patch-cairoutils.c deleted file mode 100644 index 65255ecab452..000000000000 --- a/astro/astrometry/files/patch-cairoutils.c +++ /dev/null @@ -1,10 +0,0 @@ ---- util/cairoutils.c.orig 2012-04-25 05:33:34.000000000 +0200 -+++ util/cairoutils.c 2012-04-25 05:35:29.000000000 +0200 -@@ -25,6 +25,7 @@ - - #include - #include -+#include - #include - - #include "an-bool.h" diff --git a/astro/astrometry/files/patch-util_cairoutils.c b/astro/astrometry/files/patch-util_cairoutils.c new file mode 100644 index 000000000000..16552f3a577a --- /dev/null +++ b/astro/astrometry/files/patch-util_cairoutils.c @@ -0,0 +1,10 @@ +--- util/cairoutils.c.orig 2015-12-12 19:02:27 UTC ++++ util/cairoutils.c +@@ -12,6 +12,7 @@ + + #include + #include ++#include + #include + #include + diff --git a/astro/astrometry/files/patch-util-permutedsort.c b/astro/astrometry/files/patch-util_permutedsort.c similarity index 77% rename from astro/astrometry/files/patch-util-permutedsort.c rename to astro/astrometry/files/patch-util_permutedsort.c index 66c756326b97..82962a23a40e 100644 --- a/astro/astrometry/files/patch-util-permutedsort.c +++ b/astro/astrometry/files/patch-util_permutedsort.c @@ -1,6 +1,6 @@ ---- util/permutedsort.c.orig 2013-10-29 22:08:09 +0800 +--- util/permutedsort.c.orig 2015-12-12 19:02:27 UTC +++ util/permutedsort.c -@@ -105,6 +105,12 @@ int* permuted_sort(const void* realarray +@@ -92,6 +92,12 @@ int* permuted_sort(const void* realarray if (isnan(d2)) return -1; \ assert(0); return 0; @@ -13,7 +13,7 @@ //printf("d1=%g, d2=%g\n", d1, d2); int compare_doubles_asc(const void* v1, const void* v2) { -@@ -135,13 +141,13 @@ int compare_floats_desc(const void* v1, +@@ -122,13 +128,13 @@ int compare_floats_desc(const void* v1, int compare_int64_asc(const void* v1, const void* v2) { int64_t f1 = *(int64_t*)v1; int64_t f2 = *(int64_t*)v2; @@ -28,4 +28,4 @@ + COMPARE_INT(f1, f2, >, <); } - + // Versions for use with QSORT_R diff --git a/astro/boinc-astropulse/Makefile b/astro/boinc-astropulse/Makefile index 330a6bdeb48e..2771a86a4226 100644 --- a/astro/boinc-astropulse/Makefile +++ b/astro/boinc-astropulse/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= libfftw3f.so:math/fftw3-float GNU_CONFIGURE= yes USES= autoreconf gmake libtool pkgconfig tar:xz -WRKSRC= ${WRKDIR}/${DISTNAME}/client +WRKSRC_SUBDIR= client CPPFLAGS+= -I${LOCALBASE}/include/boinc -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib diff --git a/astro/boinc-astropulse/files/patch-client__Makefile.am b/astro/boinc-astropulse/files/patch-Makefile.am similarity index 82% rename from astro/boinc-astropulse/files/patch-client__Makefile.am rename to astro/boinc-astropulse/files/patch-Makefile.am index ff5a32b8fd46..9083bb5b2dda 100644 --- a/astro/boinc-astropulse/files/patch-client__Makefile.am +++ b/astro/boinc-astropulse/files/patch-Makefile.am @@ -1,6 +1,6 @@ ---- Makefile.am (revision 633) -+++ Makefile.am (working copy) -@@ -31,7 +31,7 @@ +--- Makefile.am.orig 2009-06-11 17:35:16 UTC ++++ Makefile.am +@@ -31,7 +31,7 @@ if ENABLE_GUI GUI_C_FLAGS = $(CLIENT_C_FLAGS) $(GRAPHICS_CFLAGS) GUI_LD_FLAGS = $(CLIENT_LD_FLAGS) GUI_LD_ADD = -L$(BOINCDIR)/api -L$(BOINCDIR)/lib $(BOINC_LIBS) $(GRAPHICS_LIBS_RAW) $(APP_LIBS) diff --git a/astro/boinc-astropulse/files/patch-client__ap_client_main.cpp b/astro/boinc-astropulse/files/patch-ap__client__main.cpp similarity index 72% rename from astro/boinc-astropulse/files/patch-client__ap_client_main.cpp rename to astro/boinc-astropulse/files/patch-ap__client__main.cpp index 6c21d7b9330a..8c8b3d28a70f 100644 --- a/astro/boinc-astropulse/files/patch-client__ap_client_main.cpp +++ b/astro/boinc-astropulse/files/patch-ap__client__main.cpp @@ -1,6 +1,6 @@ ---- ap_client_main.cpp.orig 2012-08-14 02:07:20.000000000 +0200 -+++ ap_client_main.cpp 2013-08-06 18:41:38.000000000 +0200 -@@ -1288,7 +1288,6 @@ +--- ap_client_main.cpp.orig 2012-08-14 00:07:20 UTC ++++ ap_client_main.cpp +@@ -1288,7 +1288,6 @@ void Science::mainloop() { * used to inform the core client GUI of the % complete. */ boinc_fraction_done(state.frac_done); diff --git a/astro/boinc-astropulse/files/patch-client__ap_fileio.cpp b/astro/boinc-astropulse/files/patch-ap__fileio.cpp similarity index 52% rename from astro/boinc-astropulse/files/patch-client__ap_fileio.cpp rename to astro/boinc-astropulse/files/patch-ap__fileio.cpp index 7a0929cb3dad..649bf4b31e33 100644 --- a/astro/boinc-astropulse/files/patch-client__ap_fileio.cpp +++ b/astro/boinc-astropulse/files/patch-ap__fileio.cpp @@ -1,5 +1,5 @@ ---- ap_fileio.cpp.orig 2012-02-28 00:01:04.000000000 +0100 -+++ ap_fileio.cpp 2013-08-05 22:45:10.000000000 +0200 +--- ap_fileio.cpp.orig 2012-02-27 23:01:04 UTC ++++ ap_fileio.cpp @@ -22,6 +22,7 @@ #include "windows.h" #endif diff --git a/astro/boinc-astropulse/files/patch-client__ap_fold.cpp b/astro/boinc-astropulse/files/patch-ap__fold.cpp similarity index 73% rename from astro/boinc-astropulse/files/patch-client__ap_fold.cpp rename to astro/boinc-astropulse/files/patch-ap__fold.cpp index 1b37fa85c797..23d13a925dfd 100644 --- a/astro/boinc-astropulse/files/patch-client__ap_fold.cpp +++ b/astro/boinc-astropulse/files/patch-ap__fold.cpp @@ -1,6 +1,6 @@ ---- ap_fold.cpp.orig 2009-04-01 02:11:24.000000000 +0200 -+++ ap_fold.cpp 2013-08-06 18:42:02.000000000 +0200 -@@ -283,7 +283,6 @@ +--- ap_fold.cpp.orig 2009-04-01 00:11:24 UTC ++++ ap_fold.cpp +@@ -283,7 +283,6 @@ int Science::ffa(float *data, int num_su * used to inform the core client GUI of the % complete. */ boinc_fraction_done(state.frac_done); diff --git a/astro/boinc-astropulse/files/patch-client__ap_remove_radar.cpp b/astro/boinc-astropulse/files/patch-ap__remove__radar.cpp similarity index 50% rename from astro/boinc-astropulse/files/patch-client__ap_remove_radar.cpp rename to astro/boinc-astropulse/files/patch-ap__remove__radar.cpp index 102c63b9839b..ee531cec87f4 100644 --- a/astro/boinc-astropulse/files/patch-client__ap_remove_radar.cpp +++ b/astro/boinc-astropulse/files/patch-ap__remove__radar.cpp @@ -1,5 +1,5 @@ ---- ap_remove_radar.cpp.orig 2012-01-26 07:53:16.000000000 +0100 -+++ ap_remove_radar.cpp 2012-08-12 00:14:40.000000000 +0200 +--- ap_remove_radar.cpp.orig 2012-01-26 06:53:16 UTC ++++ ap_remove_radar.cpp @@ -1,5 +1,4 @@ #include "astropulse.h" -#include "ap_graphics.h" diff --git a/astro/boinc-astropulse/files/patch-client__configure.ac b/astro/boinc-astropulse/files/patch-configure.ac similarity index 78% rename from astro/boinc-astropulse/files/patch-client__configure.ac rename to astro/boinc-astropulse/files/patch-configure.ac index e91d5942cc49..f02cac4fe642 100644 --- a/astro/boinc-astropulse/files/patch-client__configure.ac +++ b/astro/boinc-astropulse/files/patch-configure.ac @@ -1,8 +1,8 @@ ---- configure.ac.orig 2009-06-11 19:35:16.000000000 +0200 -+++ configure.ac 2010-11-28 11:40:22.000000000 +0100 -@@ -7,17 +7,9 @@ - dnl Process this file with autoconf to produce a configure script. - AC_INIT(astropulse, 5.06) +--- configure.ac.orig 2012-08-14 00:07:20 UTC ++++ configure.ac +@@ -10,17 +10,9 @@ AC_INIT(astropulse, 6.01) + dnl tell libtool the location of the m4 macros + AC_CONFIG_MACRO_DIR([m4]) -svnrev="`svn info | grep Revision:`" - @@ -20,7 +20,7 @@ echo "--- Configuring Astropulse $AC_PACKAGE_VERSION ---" -@@ -262,9 +254,7 @@ +@@ -267,9 +259,7 @@ dnl AC_CHECK_LIB([z], [uncompress]) dnl AC_CHECK_LIB([stdc++], [main]) SAH_GRX_LIBS AC_LANG(C++) @@ -30,7 +30,7 @@ AC_CACHE_SAVE if test "${ac_cv_cxx_compiler_gnu}" = "yes" ; then -@@ -378,7 +368,7 @@ +@@ -383,7 +373,7 @@ AM_CONDITIONAL(ENABLE_CLIENT, [test "${e AM_CONDITIONAL(ENABLE_GUI, [test "${enable_graphics}" = yes]) AM_CONDITIONAL(LINUX, [test -n "`echo ${target} | grep linux`"]) AM_CONDITIONAL(I386, [test -n "`echo ${target} | grep i.86`"]) diff --git a/astro/boinc-astropulse/files/patch-client__m4__sah_check_boinc.m4 b/astro/boinc-astropulse/files/patch-m4_sah__check__boinc.m4 similarity index 66% rename from astro/boinc-astropulse/files/patch-client__m4__sah_check_boinc.m4 rename to astro/boinc-astropulse/files/patch-m4_sah__check__boinc.m4 index d1996c0de03d..6cbf7ca91f6f 100644 --- a/astro/boinc-astropulse/files/patch-client__m4__sah_check_boinc.m4 +++ b/astro/boinc-astropulse/files/patch-m4_sah__check__boinc.m4 @@ -1,6 +1,6 @@ ---- m4/sah_check_boinc.m4.orig 2010-03-23 22:00:23.000000000 +0100 -+++ m4/sah_check_boinc.m4 2011-03-13 16:32:29.000000000 +0100 -@@ -30,7 +30,7 @@ +--- m4/sah_check_boinc.m4.orig 2010-03-23 21:00:23 UTC ++++ m4/sah_check_boinc.m4 +@@ -30,7 +30,7 @@ AC_DEFUN([SAH_CHECK_BOINC],[ cd $thisdir break else diff --git a/astro/boinc-setiathome-v7/files/patch-client__Makefile.am b/astro/boinc-setiathome-v7/files/patch-client_Makefile.am similarity index 77% rename from astro/boinc-setiathome-v7/files/patch-client__Makefile.am rename to astro/boinc-setiathome-v7/files/patch-client_Makefile.am index 8bf2690d6c2b..fe1245fe5f86 100644 --- a/astro/boinc-setiathome-v7/files/patch-client__Makefile.am +++ b/astro/boinc-setiathome-v7/files/patch-client_Makefile.am @@ -1,6 +1,6 @@ ---- client/Makefile.am.orig 2009-09-23 01:50:50.000000000 +0200 -+++ client/Makefile.am 2011-12-04 17:19:18.000000000 +0100 -@@ -165,7 +165,7 @@ +--- client/Makefile.am.orig 2013-06-26 17:01:48 UTC ++++ client/Makefile.am +@@ -199,7 +199,7 @@ if PPC seti_boinc-analyzeFuncs_altivec.o: vector/analyzeFuncs_altivec.cpp if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(seti_boinc_CXXFLAGS) $(CXXFLAGS) -DUSE_ALTIVEC \ diff --git a/astro/boinc-setiathome-v7/files/patch-client__vector__analyzeFuncs_sse.cpp b/astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__sse.cpp similarity index 82% rename from astro/boinc-setiathome-v7/files/patch-client__vector__analyzeFuncs_sse.cpp rename to astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__sse.cpp index 162d1cb8509f..65ac60317069 100644 --- a/astro/boinc-setiathome-v7/files/patch-client__vector__analyzeFuncs_sse.cpp +++ b/astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__sse.cpp @@ -1,6 +1,6 @@ ---- client/vector/analyzeFuncs_sse.cpp.origin 2013-08-02 01:08:24.000000000 +0400 -+++ client/vector/analyzeFuncs_sse.cpp 2013-08-02 01:18:33.000000000 +0400 -@@ -191,7 +191,7 @@ +--- client/vector/analyzeFuncs_sse.cpp.orig 2013-06-26 16:56:49 UTC ++++ client/vector/analyzeFuncs_sse.cpp +@@ -191,7 +191,7 @@ inline void v_vsubTranspose4(float *in, prefetcht0(out+3*yline); // TODO: figure out why the intrinsic version crashes for MinGW build // not critical, but shuffle-only _MM_TRANSPOSE4_PS is optimal on some @@ -9,7 +9,7 @@ register float4 row0=*(__m128 *)in; register float4 row1=*(__m128 *)(in+xline); register float4 row2=*(__m128 *)(in+2*xline); -@@ -273,7 +273,7 @@ +@@ -273,7 +273,7 @@ inline void v_vsubTranspose4np(float *in // TODO: figure out why the intrinsic version crashes for MinGW build // not critical, but the shuffle-only _MM_TRANSPOSE4_PS is optimal on some @@ -18,7 +18,7 @@ register float4 row0=*(__m128 *)in; register float4 row1=*(__m128 *)(in+xline); register float4 row2=*(__m128 *)(in+2*xline); -@@ -1592,8 +1592,14 @@ +@@ -1592,8 +1592,14 @@ inline float s_maxp2f( __m128 max1 ) { return ( tMax ); } diff --git a/astro/boinc-setiathome-v7/files/patch-client__vector__analyzeFuncs_vector.cpp b/astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__vector.cpp similarity index 60% rename from astro/boinc-setiathome-v7/files/patch-client__vector__analyzeFuncs_vector.cpp rename to astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__vector.cpp index 1a418db27f3e..f047dc9898ca 100644 --- a/astro/boinc-setiathome-v7/files/patch-client__vector__analyzeFuncs_vector.cpp +++ b/astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__vector.cpp @@ -1,5 +1,5 @@ ---- client/vector/analyzeFuncs_vector.cpp.orig 2013-07-11 22:32:37.000000000 +0200 -+++ client/vector/analyzeFuncs_vector.cpp 2013-07-11 22:41:59.000000000 +0200 +--- client/vector/analyzeFuncs_vector.cpp.orig 2011-08-04 00:35:40 UTC ++++ client/vector/analyzeFuncs_vector.cpp @@ -98,9 +98,7 @@ diff --git a/astro/boinc-setiathome-v7/files/patch-client__vector__analyzeFuncs_x86_64.cpp b/astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__x86__64.cpp similarity index 75% rename from astro/boinc-setiathome-v7/files/patch-client__vector__analyzeFuncs_x86_64.cpp rename to astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__x86__64.cpp index beb6e2abfc7a..82b9b0df5fff 100644 --- a/astro/boinc-setiathome-v7/files/patch-client__vector__analyzeFuncs_x86_64.cpp +++ b/astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__x86__64.cpp @@ -1,6 +1,6 @@ ---- client/vector/analyzeFuncs_x86_64.cpp.orig 2011-04-03 07:25:53.000000000 +0200 -+++ client/vector/analyzeFuncs_x86_64.cpp 2013-07-29 17:41:37.000000000 +0200 -@@ -61,8 +61,14 @@ +--- client/vector/analyzeFuncs_x86_64.cpp.orig 2011-04-03 05:25:53 UTC ++++ client/vector/analyzeFuncs_x86_64.cpp +@@ -61,8 +61,14 @@ int v_vChirpData_x86_64( static const int as [4] __attribute__((aligned(16)))= {INT_MIN, 0, INT_MIN, 0} ; // {-, +, -, +} char *cblock = (char *)alloca(11*16); cblock+=(16-((ssize_t)cblock % 16)); diff --git a/astro/boinc-setiathome-v7/files/patch-client__vector__x86_float4.h b/astro/boinc-setiathome-v7/files/patch-client_vector_x86__float4.h similarity index 70% rename from astro/boinc-setiathome-v7/files/patch-client__vector__x86_float4.h rename to astro/boinc-setiathome-v7/files/patch-client_vector_x86__float4.h index e8e426206164..75316f94e46c 100644 --- a/astro/boinc-setiathome-v7/files/patch-client__vector__x86_float4.h +++ b/astro/boinc-setiathome-v7/files/patch-client_vector_x86__float4.h @@ -1,6 +1,6 @@ ---- client/vector/x86_float4.h.orig 2011-05-22 21:08:50.000000000 +0200 -+++ client/vector/x86_float4.h 2013-07-29 18:52:18.000000000 +0200 -@@ -58,11 +58,15 @@ +--- client/vector/x86_float4.h.orig 2011-05-22 19:08:50 UTC ++++ client/vector/x86_float4.h +@@ -58,11 +58,15 @@ extern const_float4 INDGEN[2]; ALIGNED(static const int sign_bits[4],16)={INT_MIN, INT_MIN, INT_MIN, INT_MIN}; ALIGNED(static const int other_bits[4],16)={INT_MAX, INT_MAX, INT_MAX, INT_MAX}; @@ -18,7 +18,7 @@ struct float4 { float4() {}; float4(const __m128 b) { m=b; }; -@@ -263,4 +267,3 @@ +@@ -263,4 +267,3 @@ struct const_float4 : public float4 { #endif #endif diff --git a/astro/boinc-setiathome-v7/files/patch-client__vector__x86_ops.h b/astro/boinc-setiathome-v7/files/patch-client_vector_x86__ops.h similarity index 72% rename from astro/boinc-setiathome-v7/files/patch-client__vector__x86_ops.h rename to astro/boinc-setiathome-v7/files/patch-client_vector_x86__ops.h index 27c17f4493cd..f84ade69d655 100644 --- a/astro/boinc-setiathome-v7/files/patch-client__vector__x86_ops.h +++ b/astro/boinc-setiathome-v7/files/patch-client_vector_x86__ops.h @@ -1,5 +1,5 @@ ---- client/vector/x86_ops.h.orig 2011-05-22 21:08:50.000000000 +0200 -+++ client/vector/x86_ops.h 2013-07-29 17:42:54.000000000 +0200 +--- client/vector/x86_ops.h.orig 2011-05-22 19:08:50 UTC ++++ client/vector/x86_ops.h @@ -135,7 +135,11 @@ #if defined(__SSE2__) @@ -13,7 +13,7 @@ typedef __m128d x86_m128d; #else typedef double x86_m128d __attribute__ ((mode(V2DF))) __attribute__((aligned(16))); -@@ -144,7 +148,11 @@ +@@ -144,7 +148,11 @@ typedef double x86_m128d __attribute__ ( #if defined(__SSE__) // SSE specific functions/macros here. @@ -26,7 +26,7 @@ typedef __m128 x86_m128; typedef __m128i x86_m128i; #else -@@ -186,6 +194,7 @@ +@@ -186,6 +194,7 @@ static inline void prefetchnta(const voi #endif @@ -34,7 +34,7 @@ #ifndef __m128d #define __m128d x86_m128d #endif -@@ -197,5 +206,6 @@ +@@ -197,5 +206,6 @@ static inline void prefetchnta(const voi #ifndef __m128 #define __m128 x86_m128 #endif diff --git a/astro/boinc-setiathome-v7/files/patch-configure.ac b/astro/boinc-setiathome-v7/files/patch-configure.ac index 34287cc90ad3..5cb2366b2ef7 100644 --- a/astro/boinc-setiathome-v7/files/patch-configure.ac +++ b/astro/boinc-setiathome-v7/files/patch-configure.ac @@ -1,5 +1,5 @@ ---- configure.ac.orig 2013-07-02 22:51:54.000000000 +0200 -+++ configure.ac 2013-07-11 21:40:55.000000000 +0200 +--- configure.ac.orig 2013-07-02 20:51:54 UTC ++++ configure.ac @@ -5,17 +5,10 @@ AC_PREREQ(2.57) @@ -21,7 +21,7 @@ AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(dist-zip) -@@ -55,8 +48,6 @@ +@@ -55,8 +48,6 @@ if test -z "`echo ${LDFLAGS} | grep ${tm fi # set posix source on linux diff --git a/astro/boinc-setiathome-v7/files/patch-m4__sah_check_boinc.m4 b/astro/boinc-setiathome-v7/files/patch-m4_sah__check__boinc.m4 similarity index 66% rename from astro/boinc-setiathome-v7/files/patch-m4__sah_check_boinc.m4 rename to astro/boinc-setiathome-v7/files/patch-m4_sah__check__boinc.m4 index 821d7e296845..762f6c940204 100644 --- a/astro/boinc-setiathome-v7/files/patch-m4__sah_check_boinc.m4 +++ b/astro/boinc-setiathome-v7/files/patch-m4_sah__check__boinc.m4 @@ -1,6 +1,6 @@ ---- m4/sah_check_boinc.m4.orig 2008-09-09 18:55:19.000000000 +0200 -+++ m4/sah_check_boinc.m4 2011-03-13 16:24:18.000000000 +0100 -@@ -30,7 +30,7 @@ +--- m4/sah_check_boinc.m4.orig 2008-09-09 16:55:19 UTC ++++ m4/sah_check_boinc.m4 +@@ -30,7 +30,7 @@ AC_DEFUN([SAH_CHECK_BOINC],[ cd $thisdir break else diff --git a/astro/boinc-setiathome-v7/files/patch-sah_config.h b/astro/boinc-setiathome-v7/files/patch-sah__config.h similarity index 74% rename from astro/boinc-setiathome-v7/files/patch-sah_config.h rename to astro/boinc-setiathome-v7/files/patch-sah__config.h index c24b82c8a6c6..b88bf5b419df 100644 --- a/astro/boinc-setiathome-v7/files/patch-sah_config.h +++ b/astro/boinc-setiathome-v7/files/patch-sah__config.h @@ -1,5 +1,5 @@ ---- sah_config.h.orig 2012-09-19 00:45:14.000000000 +0200 -+++ sah_config.h 2013-07-19 18:35:22.000000000 +0200 +--- sah_config.h.orig 2012-09-18 22:45:14 UTC ++++ sah_config.h @@ -21,7 +21,7 @@ #define AVX_MASKSTORE_TYPECAST(x) reinterpret_cast<__m256i>(x) diff --git a/astro/fowsr/files/patch-fowsr-c b/astro/fowsr/files/patch-fowsr.c similarity index 84% rename from astro/fowsr/files/patch-fowsr-c rename to astro/fowsr/files/patch-fowsr.c index d7eb95d15757..9e312de81977 100644 --- a/astro/fowsr/files/patch-fowsr-c +++ b/astro/fowsr/files/patch-fowsr.c @@ -1,6 +1,6 @@ ---- fowsr.c.orig 2010-07-18 18:06:30.000000000 +0200 -+++ fowsr.c 2010-09-01 10:59:58.004518772 +0200 -@@ -110,13 +110,17 @@ +--- fowsr.c.orig 2016-07-26 12:57:00 UTC ++++ fowsr.c +@@ -110,13 +110,17 @@ int CUSB_Open(int vendor, int product) signal(SIGTERM, release_usb_device); @@ -18,7 +18,7 @@ ret = usb_claim_interface(devh, 0); if (ret != 0) { printf("claim failed with error %d\n", ret); -@@ -159,12 +163,14 @@ +@@ -159,12 +163,14 @@ void CWS_Cache(char isStoring) FILE* f; if (isStoring == ISREADING) { if (f=fopen(fname,"rb")) { @@ -33,7 +33,7 @@ n=fwrite(&m_timestamp,sizeof(m_timestamp),1,f); n=fwrite(m_buf,sizeof(m_buf[0]),WS_BUFFER_SIZE,f); } -@@ -566,6 +572,7 @@ +@@ -566,6 +572,7 @@ int CWF_Write(char arg,char* fname) FILE* f; if (f=fopen(fname,"a+s")) { diff --git a/astro/foxtrotgps/files/patch-src_tracks.c b/astro/foxtrotgps/files/patch-src_tracks.c index b31601124a4b..bb6d6f0aed5f 100644 --- a/astro/foxtrotgps/files/patch-src_tracks.c +++ b/astro/foxtrotgps/files/patch-src_tracks.c @@ -1,4 +1,4 @@ ---- src/tracks.c.orig 2015-05-21 11:26:32 UTC +--- src/tracks.c.orig 2014-10-24 04:57:10 UTC +++ src/tracks.c @@ -41,8 +41,10 @@ bbox_t get_track_bbox(GSList *track); GSList * load_log_file_into_list(char *file); diff --git a/astro/gkrellmoon2/files/patch-CalcEphem.c b/astro/gkrellmoon2/files/patch-CalcEphem.c index 780aa1d2a3be..7d65e0d68381 100644 --- a/astro/gkrellmoon2/files/patch-CalcEphem.c +++ b/astro/gkrellmoon2/files/patch-CalcEphem.c @@ -1,5 +1,5 @@ ---- CalcEphem.c.orig Thu Aug 15 20:41:03 2002 -+++ CalcEphem.c Thu Aug 15 20:41:23 2002 +--- CalcEphem.c.orig 2002-12-11 03:36:06 UTC ++++ CalcEphem.c @@ -8,6 +8,7 @@ #ifdef HAVE_CONFIG_H #include diff --git a/astro/gkrellmoon2/files/patch-Makefile b/astro/gkrellmoon2/files/patch-Makefile index 66c053c20eab..e08f52ee9eb3 100644 --- a/astro/gkrellmoon2/files/patch-Makefile +++ b/astro/gkrellmoon2/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig Wed Dec 11 04:36:06 2002 -+++ Makefile Wed Aug 25 13:09:01 2004 -@@ -4,11 +4,9 @@ +--- Makefile.orig 2002-12-11 03:36:06 UTC ++++ Makefile +@@ -4,12 +4,10 @@ GTK_LIB = `pkg-config gtk+-2.0 --libs` INSTALLDIR = ${DESTDIR}/usr/lib/gkrellm2/plugins @@ -8,8 +8,9 @@ +CFLAGS += -Wall -fPIC $(GTK_INCLUDE) LIBS = $(GTK_LIB) LFLAGS = -shared -- --CC = gcc $(CFLAGS) $(FLAGS) +-CC = gcc $(CFLAGS) $(FLAGS) +- OBJS = gkrellmoon.o MoonRise.o CalcEphem.o Moon.o + gkrellmoon.so: $(OBJS) diff --git a/astro/gmapcatcher/files/patch-gmapcatcher_mapArgs.py b/astro/gmapcatcher/files/patch-gmapcatcher_mapArgs.py index 5d06dd885401..f922dd520bf2 100644 --- a/astro/gmapcatcher/files/patch-gmapcatcher_mapArgs.py +++ b/astro/gmapcatcher/files/patch-gmapcatcher_mapArgs.py @@ -1,6 +1,6 @@ ---- gmapcatcher/mapArgs.py.orig 2012-10-17 02:09:15.000000000 +0800 -+++ gmapcatcher/mapArgs.py 2012-12-12 13:58:33.000000000 +0800 -@@ -46,10 +46,10 @@ +--- gmapcatcher/mapArgs.py.orig 2013-07-19 08:20:47 UTC ++++ gmapcatcher/mapArgs.py +@@ -46,10 +46,10 @@ class MapArgs(): print ' very useful to download maps of entire world' print ' ' print 'SAMPLE USAGE' @@ -15,7 +15,7 @@ def __init__(self, arrArgs=()): if len(arrArgs) > 1: -@@ -99,7 +99,7 @@ +@@ -99,7 +99,7 @@ class MapArgs(): self.lng_range = 179 def __str__(self): diff --git a/astro/gmapcatcher/files/patch-setup.py b/astro/gmapcatcher/files/patch-setup.py index ba5a82f6741b..7f6d4a342b8c 100644 --- a/astro/gmapcatcher/files/patch-setup.py +++ b/astro/gmapcatcher/files/patch-setup.py @@ -1,6 +1,6 @@ ---- setup.py.orig 2012-10-17 02:09:15.000000000 +0800 -+++ setup.py 2012-12-12 13:13:04.000000000 +0800 -@@ -13,15 +13,13 @@ +--- setup.py.orig 2013-07-19 08:20:47 UTC ++++ setup.py +@@ -13,15 +13,13 @@ if os.name == "posix": description = 'Offline Map Viewer', version = VERSION, url = WEB_ADDRESS, diff --git a/astro/google-earth/files/patch-bin-googleearth b/astro/google-earth/files/patch-bin-googleearth index a56aeb9494d6..0a3428911691 100644 --- a/astro/google-earth/files/patch-bin-googleearth +++ b/astro/google-earth/files/patch-bin-googleearth @@ -1,6 +1,6 @@ ---- ./bin/googleearth.orig 2011-05-17 10:42:02.000000000 +0300 -+++ ./bin/googleearth 2014-03-13 08:59:26.456795260 +0200 -@@ -8,6 +8,17 @@ +--- bin/googleearth.orig 2011-05-17 07:42:02 UTC ++++ bin/googleearth +@@ -8,6 +8,17 @@ if [ "${GOOGLEEARTH_DATA_PATH}" = "" ]; GOOGLEEARTH_DATA_PATH="$(dirname "$(readlink -f "$0")")" fi @@ -18,7 +18,7 @@ LD_LIBRARY_PATH=.:${GOOGLEEARTH_DATA_PATH}:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH -@@ -15,10 +26,11 @@ +@@ -15,10 +26,11 @@ export LD_LIBRARY_PATH if [ -x "${GOOGLEEARTH_DATA_PATH}/googleearth-bin" ] then cd "${GOOGLEEARTH_DATA_PATH}/" diff --git a/astro/gpsbabel/files/patch-Makefile.in b/astro/gpsbabel/files/patch-Makefile.in index 218684aeab3a..c83b242e4b2e 100644 --- a/astro/gpsbabel/files/patch-Makefile.in +++ b/astro/gpsbabel/files/patch-Makefile.in @@ -1,4 +1,4 @@ ---- Makefile.in.orig +--- Makefile.in.orig 2016-01-03 02:09:17 UTC +++ Makefile.in @@ -148,10 +148,10 @@ toolinfo all: gpsbabel$(EXEEXT) diff --git a/astro/gpsbabel/files/patch-jeeps-gpslibusb.cc b/astro/gpsbabel/files/patch-jeeps_gpslibusb.cc similarity index 78% rename from astro/gpsbabel/files/patch-jeeps-gpslibusb.cc rename to astro/gpsbabel/files/patch-jeeps_gpslibusb.cc index 60f7859af9dc..6995a8224c48 100644 --- a/astro/gpsbabel/files/patch-jeeps-gpslibusb.cc +++ b/astro/gpsbabel/files/patch-jeeps_gpslibusb.cc @@ -1,4 +1,4 @@ ---- jeeps/gpslibusb.cc.orig +--- jeeps/gpslibusb.cc.orig 2016-01-03 02:09:17 UTC +++ jeeps/gpslibusb.cc @@ -20,8 +20,8 @@ */ diff --git a/astro/gpsbabel/files/patch-src-core-ziparchive.cc b/astro/gpsbabel/files/patch-src_core_ziparchive.cc similarity index 79% rename from astro/gpsbabel/files/patch-src-core-ziparchive.cc rename to astro/gpsbabel/files/patch-src_core_ziparchive.cc index 283b5a6ddd2e..718db70a6496 100644 --- a/astro/gpsbabel/files/patch-src-core-ziparchive.cc +++ b/astro/gpsbabel/files/patch-src_core_ziparchive.cc @@ -1,4 +1,4 @@ ---- src/core/ziparchive.cc.orig +--- src/core/ziparchive.cc.orig 2016-01-03 02:09:17 UTC +++ src/core/ziparchive.cc @@ -23,7 +23,7 @@ diff --git a/astro/gpsbabel/files/patch-src-core-ziparchive.h b/astro/gpsbabel/files/patch-src_core_ziparchive.h similarity index 77% rename from astro/gpsbabel/files/patch-src-core-ziparchive.h rename to astro/gpsbabel/files/patch-src_core_ziparchive.h index 3a2165d7be69..b6816189892f 100644 --- a/astro/gpsbabel/files/patch-src-core-ziparchive.h +++ b/astro/gpsbabel/files/patch-src_core_ziparchive.h @@ -1,4 +1,4 @@ ---- src/core/ziparchive.h.orig +--- src/core/ziparchive.h.orig 2016-01-03 02:09:17 UTC +++ src/core/ziparchive.h @@ -21,7 +21,7 @@ diff --git a/astro/gpsbabel14/files/patch-libusb b/astro/gpsbabel14/files/patch-libusb index 4bf7613de5d0..99caa8136d9c 100644 --- a/astro/gpsbabel14/files/patch-libusb +++ b/astro/gpsbabel14/files/patch-libusb @@ -1,6 +1,6 @@ ---- configure.in.orig 2008-10-31 15:43:21.000000000 +0300 -+++ configure.in 2009-03-07 01:08:46.000000000 +0300 -@@ -170,6 +169,28 @@ +--- configure.in.orig 2012-09-03 22:09:52 UTC ++++ configure.in +@@ -189,6 +189,28 @@ case "$target" in AC_DEFINE(HAVE_LIBUSB, 1) CFLAGS="$CFLAGS -Imac/libusb/" ;; diff --git a/astro/gpsd/files/patch-libgps.pc.in b/astro/gpsd/files/patch-libgps.pc.in index 2a0106e99fcf..3242278e458f 100644 --- a/astro/gpsd/files/patch-libgps.pc.in +++ b/astro/gpsd/files/patch-libgps.pc.in @@ -1,5 +1,5 @@ ---- libgps.pc.in.orig 2015-01-25 12:09:01.000000000 +0000 -+++ libgps.pc.in 2015-05-21 02:11:05.192169497 +0000 +--- libgps.pc.in.orig 2015-01-25 12:09:01 UTC ++++ libgps.pc.in @@ -1,6 +1,6 @@ prefix=@prefix@ exec_prefix=${prefix} diff --git a/astro/gpsd/files/patch-libgpsd.pc.in b/astro/gpsd/files/patch-libgpsd.pc.in index 913feef4b813..1f716e4d7ba4 100644 --- a/astro/gpsd/files/patch-libgpsd.pc.in +++ b/astro/gpsd/files/patch-libgpsd.pc.in @@ -1,5 +1,5 @@ ---- libgpsd.pc.in.orig 2015-01-23 18:48:09.000000000 +0000 -+++ libgpsd.pc.in 2015-05-21 02:11:05.192169497 +0000 +--- libgpsd.pc.in.orig 2015-01-23 18:48:09 UTC ++++ libgpsd.pc.in @@ -1,6 +1,6 @@ prefix=@prefix@ exec_prefix=${prefix} diff --git a/astro/gpsdrive/files/patch-src__gpsserial.c b/astro/gpsdrive/files/patch-src_gpsserial.c similarity index 77% rename from astro/gpsdrive/files/patch-src__gpsserial.c rename to astro/gpsdrive/files/patch-src_gpsserial.c index 531570d64224..208613e2d91c 100644 --- a/astro/gpsdrive/files/patch-src__gpsserial.c +++ b/astro/gpsdrive/files/patch-src_gpsserial.c @@ -1,6 +1,6 @@ ---- src/gpsserial.c.orig Thu Feb 12 18:42:53 2004 -+++ src/gpsserial.c Mon Sep 6 00:44:34 2004 -@@ -178,7 +178,9 @@ +--- src/gpsserial.c.orig 2004-02-12 17:42:53 UTC ++++ src/gpsserial.c +@@ -178,7 +178,9 @@ readinput_init (void) CLOCAL : local connection, no modem contol CREAD : enable receiving characters */ diff --git a/astro/gpsdrive/files/patch-src__splash.c b/astro/gpsdrive/files/patch-src_splash.c similarity index 92% rename from astro/gpsdrive/files/patch-src__splash.c rename to astro/gpsdrive/files/patch-src_splash.c index 22e57ada2d77..5f12a99db103 100644 --- a/astro/gpsdrive/files/patch-src__splash.c +++ b/astro/gpsdrive/files/patch-src_splash.c @@ -1,6 +1,6 @@ ---- src/splash.c.orig Mon Jun 7 09:55:30 2004 -+++ src/splash.c Mon Jun 7 09:56:28 2004 -@@ -529,6 +529,24 @@ +--- src/splash.c.orig 2004-03-02 03:07:17 UTC ++++ src/splash.c +@@ -529,6 +529,24 @@ insert_text (GtkTextBuffer * buffer) { GtkTextIter iter; GtkTextIter start, end; @@ -25,7 +25,7 @@ /* demo_find_file() looks in the the current directory first, * so you can run gtk-demo without installing GTK, then looks -@@ -564,19 +582,7 @@ +@@ -564,19 +582,7 @@ insert_text (GtkTextBuffer * buffer) -1, "blue_foreground", NULL); gtk_text_buffer_insert (buffer, &iter, "\n", -1); @@ -45,7 +45,7 @@ gtk_text_buffer_insert (buffer, &iter, t1, -1); gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, -@@ -592,12 +598,6 @@ +@@ -592,12 +598,6 @@ insert_text (GtkTextBuffer * buffer) -1, "underline", NULL); gtk_text_buffer_insert (buffer, &iter, _(" letters in the button text.\n"), -1); diff --git a/astro/gpsman/files/patch-gpsman.tcl b/astro/gpsman/files/patch-gpsman.tcl index 260fa54fea1f..34ba22be299a 100644 --- a/astro/gpsman/files/patch-gpsman.tcl +++ b/astro/gpsman/files/patch-gpsman.tcl @@ -1,20 +1,19 @@ -diff -ruN gpsman.tcl gpsman.tcl ---- gpsman.tcl Tue May 9 02:37:24 2006 -+++ gpsman.tcl Wed May 10 17:56:02 2006 +--- gpsman.tcl.orig 2013-10-06 21:12:47 UTC ++++ gpsman.tcl @@ -1,6 +1,6 @@ #!/bin/sh # This is a Tcl/Tk script to be interpreted by wish (Tk8.3 or better): \ -exec wish "$0" -- "$@" +exec %%WISH%% "$0" -- "$@" + # This is the main file of: # - # gpsman --- GPS Manager: a manager for GPS receiver data -@@ -247,7 +247,7 @@ +@@ -247,7 +247,7 @@ switch $tcl_platform(platform) { } # path to directory containing program files -set SRCDIR gmsrc +set SRCDIR %%GPSMANDIR%%/gmsrc - # all other defaults configuration is now done in file $SRCDIR/config.tcl + # all other default configuration is now done in file $SRCDIR/config.tcl diff --git a/astro/kstars/files/patch-kstars__skyobjects__kscomet.cpp b/astro/kstars/files/patch-kstars_skyobjects_kscomet.cpp similarity index 65% rename from astro/kstars/files/patch-kstars__skyobjects__kscomet.cpp rename to astro/kstars/files/patch-kstars_skyobjects_kscomet.cpp index 9b06ba84006e..85037a9c3a6e 100644 --- a/astro/kstars/files/patch-kstars__skyobjects__kscomet.cpp +++ b/astro/kstars/files/patch-kstars_skyobjects_kscomet.cpp @@ -1,6 +1,6 @@ ---- kstars/skyobjects/kscomet.cpp.orig 2014-09-15 23:02:14.160209962 +0200 -+++ kstars/skyobjects/kscomet.cpp 2014-09-15 23:03:33.261204279 +0200 -@@ -119,7 +119,7 @@ +--- kstars/skyobjects/kscomet.cpp.orig 2014-09-19 05:39:42 UTC ++++ kstars/skyobjects/kscomet.cpp +@@ -119,7 +119,7 @@ KSComet::KSComet( const QString &_s, con qint64 fragment = letterDesigToN( rePro.cap(6) ); uidPart = diff --git a/astro/libnova/files/patch-src_hyperbolic_motion.c b/astro/libnova/files/patch-src_hyperbolic__motion.c similarity index 79% rename from astro/libnova/files/patch-src_hyperbolic_motion.c rename to astro/libnova/files/patch-src_hyperbolic__motion.c index f5af5ce7154c..70492aa02d1a 100644 --- a/astro/libnova/files/patch-src_hyperbolic_motion.c +++ b/astro/libnova/files/patch-src_hyperbolic__motion.c @@ -1,6 +1,6 @@ ---- src/hyperbolic_motion.c.orig Tue Jul 5 11:09:22 2005 -+++ src/hyperbolic_motion.c Sat Feb 18 02:17:12 2006 -@@ -69,12 +69,12 @@ +--- src/hyperbolic_motion.c.orig 2011-07-28 11:02:50 UTC ++++ src/hyperbolic_motion.c +@@ -70,12 +70,12 @@ next_z: F = Z1 * G1; Q3 = Q3 + F; if (Z > 100 || fabs(F) > 10000) diff --git a/astro/libnova/files/patch-src_precession.c b/astro/libnova/files/patch-src_precession.c index 0f7784f12cef..78d8c407d871 100644 --- a/astro/libnova/files/patch-src_precession.c +++ b/astro/libnova/files/patch-src_precession.c @@ -1,6 +1,6 @@ ---- src/precession.c.orig Tue Jan 10 23:35:08 2006 -+++ src/precession.c Tue Aug 15 18:03:50 2006 -@@ -56,21 +56,21 @@ +--- src/precession.c.orig 2011-07-28 11:02:50 UTC ++++ src/precession.c +@@ -82,21 +82,21 @@ void ln_get_equ_prec (struct ln_equ_posn theta = ln_deg_to_rad (theta); /* calc A,B,C equ 20.4 */ @@ -28,7 +28,7 @@ } /* change to degrees */ -@@ -114,21 +114,21 @@ +@@ -140,21 +140,21 @@ void ln_get_equ_prec2 (struct ln_equ_pos theta = ln_deg_to_rad (theta); /* calc A,B,C equ 20.4 */ diff --git a/astro/libnova/files/patch-src__utility.c b/astro/libnova/files/patch-src_utility.c similarity index 60% rename from astro/libnova/files/patch-src__utility.c rename to astro/libnova/files/patch-src_utility.c index 2a9161955e31..5b77ca6862a4 100644 --- a/astro/libnova/files/patch-src__utility.c +++ b/astro/libnova/files/patch-src_utility.c @@ -1,8 +1,8 @@ ---- src/utility.c.orig Wed Jan 17 08:16:02 2007 -+++ src/utility.c Sat Feb 10 12:08:36 2007 -@@ -45,10 +45,6 @@ +--- src/utility.c.orig 2012-04-28 09:41:42 UTC ++++ src/utility.c +@@ -44,10 +44,6 @@ #include - #include + #include -#ifndef __APPLE__ -#include diff --git a/astro/luna/files/patch-iprintf-iprintf.c b/astro/luna/files/patch-iprintf_iprintf.c similarity index 87% rename from astro/luna/files/patch-iprintf-iprintf.c rename to astro/luna/files/patch-iprintf_iprintf.c index fa449c78759d..7f0a5f4f6cf0 100644 --- a/astro/luna/files/patch-iprintf-iprintf.c +++ b/astro/luna/files/patch-iprintf_iprintf.c @@ -1,5 +1,5 @@ ---- iprintf/iprintf.c.orig Thu Apr 23 16:23:14 1992 -+++ iprintf/iprintf.c Sat Nov 22 04:11:33 2003 +--- iprintf/iprintf.c.orig 2016-07-26 13:07:24 UTC ++++ iprintf/iprintf.c @@ -13,7 +13,7 @@ #if defined(ANSI) # include @@ -9,7 +9,7 @@ #else Error : varargs.h or stdarg.h is required to compile this. #endif /* ANSI or UNIX */ -@@ -52,44 +52,21 @@ +@@ -52,44 +52,21 @@ i_fputn(stream, string, count, total_cou } diff --git a/astro/luna/files/patch-iprintf-isprintf.c b/astro/luna/files/patch-iprintf_isprintf.c similarity index 88% rename from astro/luna/files/patch-iprintf-isprintf.c rename to astro/luna/files/patch-iprintf_isprintf.c index e1b3835574fb..487cb4be9061 100644 --- a/astro/luna/files/patch-iprintf-isprintf.c +++ b/astro/luna/files/patch-iprintf_isprintf.c @@ -1,5 +1,5 @@ ---- iprintf/isprintf.c.orig Thu Apr 23 16:23:16 1992 -+++ iprintf/isprintf.c Sat Nov 22 04:13:54 2003 +--- iprintf/isprintf.c.orig 2016-07-26 13:07:24 UTC ++++ iprintf/isprintf.c @@ -8,13 +8,7 @@ @@ -14,7 +14,7 @@ #if defined(ANSI) -@@ -49,47 +43,22 @@ +@@ -49,47 +43,22 @@ i_sputn(dest, string, count, total_count } diff --git a/astro/luna/files/patch-iprintf_makefile b/astro/luna/files/patch-iprintf_makefile index 941d222dd192..5171952303ad 100644 --- a/astro/luna/files/patch-iprintf_makefile +++ b/astro/luna/files/patch-iprintf_makefile @@ -1,5 +1,5 @@ ---- iprintf/makefile.orig Sun May 10 03:03:06 1992 -+++ iprintf/makefile Sat Feb 12 23:27:55 2000 +--- iprintf/makefile.orig 2016-07-26 13:07:24 UTC ++++ iprintf/makefile @@ -3,11 +3,11 @@ # @@ -16,7 +16,7 @@ # # All modules -@@ -15,9 +15,9 @@ +@@ -15,9 +15,9 @@ CFLAGS = -Ox -AS -DANSI -W4 SRCS = iansilib.c idoprnt.c iprintf.c isprintf.c # MSDOS diff --git a/astro/luna/files/patch-luna.c b/astro/luna/files/patch-luna.c index 2936f2cd56ec..4fd5e681ab80 100644 --- a/astro/luna/files/patch-luna.c +++ b/astro/luna/files/patch-luna.c @@ -1,5 +1,5 @@ ---- luna.c.orig 1992-05-25 01:01:32.000000000 +0200 -+++ luna.c 2011-12-20 19:57:51.404175556 +0100 +--- luna.c.orig 2016-07-26 13:07:24 UTC ++++ luna.c @@ -25,27 +25,43 @@ #include "luna.h" @@ -51,7 +51,7 @@ if (numonly) { printf(" "); -@@ -62,10 +78,11 @@ +@@ -62,10 +78,11 @@ main(argc, argv) today = FALSE; tomorrow(localtmp); @@ -64,7 +64,7 @@ } -@@ -177,18 +194,15 @@ +@@ -177,18 +194,15 @@ usage() void @@ -86,7 +86,7 @@ struct tm *localtmp; argnumcnt = 0; -@@ -375,20 +389,7 @@ +@@ -375,20 +389,7 @@ getoptions(argc, argv, localtmpp, algotm localtmp -> tm_yday = ymd2yday(localtmp -> tm_year, localtmp -> tm_mon, localtmp -> tm_mday); diff --git a/astro/luna/files/patch-luna.h b/astro/luna/files/patch-luna.h index 6467f053a898..2f4d6f6940b0 100644 --- a/astro/luna/files/patch-luna.h +++ b/astro/luna/files/patch-luna.h @@ -1,6 +1,6 @@ ---- luna.h~ 1992-05-25 00:48:34.000000000 +0200 -+++ luna.h 2011-12-20 19:57:27.963178999 +0100 -@@ -32,7 +32,7 @@ +--- luna.h.orig 2016-07-26 13:07:24 UTC ++++ luna.h +@@ -32,7 +32,7 @@ typedef enum { #if defined(ANSI) @@ -9,7 +9,7 @@ extern void drawluna(int aotmoon); extern void usage(void); extern void getoptions(int argc, char **argv, -@@ -40,7 +40,7 @@ +@@ -40,7 +40,7 @@ typedef enum { extern int getext(int year, int mon, int day); extern void printextstate(int age); #else diff --git a/astro/luna/files/patch-makefile b/astro/luna/files/patch-makefile index 39a3160d5029..ca6043bdf551 100644 --- a/astro/luna/files/patch-makefile +++ b/astro/luna/files/patch-makefile @@ -1,5 +1,5 @@ ---- makefile.orig 2013-10-25 16:28:17.000000000 +0800 -+++ makefile 2013-10-25 16:28:43.000000000 +0800 +--- makefile.orig 2016-07-26 13:07:24 UTC ++++ makefile @@ -2,23 +2,24 @@ # Makefile for luna using BSD cc # diff --git a/astro/luna/files/patch-pyramid.c b/astro/luna/files/patch-pyramid.c index da829614cf00..4fda198a43a5 100644 --- a/astro/luna/files/patch-pyramid.c +++ b/astro/luna/files/patch-pyramid.c @@ -1,6 +1,6 @@ ---- pyramid.c.orig Mon May 25 01:26:10 1992 -+++ pyramid.c Mon Feb 21 02:23:51 2000 -@@ -67,7 +67,7 @@ +--- pyramid.c.orig 2016-07-26 13:07:24 UTC ++++ pyramid.c +@@ -67,7 +67,7 @@ getlocaltm() Time_t ltime; time(<ime); @@ -9,7 +9,7 @@ #endif /* MSDOS or UNIX */ } -@@ -197,19 +197,14 @@ +@@ -197,19 +197,14 @@ char * Asctime(struct tm *tmp) { static char s[LASCTIME]; diff --git a/astro/luna/files/patch-pyramid.h b/astro/luna/files/patch-pyramid.h index 06ad88e9511a..c34bf77c4d2a 100644 --- a/astro/luna/files/patch-pyramid.h +++ b/astro/luna/files/patch-pyramid.h @@ -1,5 +1,5 @@ ---- pyramid.h.orig Mon May 25 01:24:12 1992 -+++ pyramid.h Mon Feb 21 02:23:55 2000 +--- pyramid.h.orig 2016-07-26 13:07:24 UTC ++++ pyramid.h @@ -14,13 +14,16 @@ # include # include @@ -20,7 +20,7 @@ #endif /* MSDOS or not */ typedef long ABDATE; -@@ -52,15 +55,6 @@ +@@ -52,15 +55,6 @@ typedef long ABDATE; # if defined(MSDOS) extern char *Asctime(struct tm *tmp); extern char *capitalize(char *chp); @@ -36,7 +36,7 @@ # endif /* ANSI and MSDOS */ #else /* ANSI */ -@@ -69,3 +63,16 @@ +@@ -69,3 +63,16 @@ typedef long ABDATE; extern void tzconv(); extern void tomorrow(); #endif /* ANSI or not */ diff --git a/astro/merkaartor/files/patch-src_src.pro b/astro/merkaartor/files/patch-src_src.pro index 28afade9d899..0319e85e7eb6 100644 --- a/astro/merkaartor/files/patch-src_src.pro +++ b/astro/merkaartor/files/patch-src_src.pro @@ -1,5 +1,5 @@ Link against the right library name for archivers/quazip-qt5. ---- src/src.pro.orig 2015-12-28 22:27:47 UTC +--- src/src.pro.orig 2015-07-19 14:50:09 UTC +++ src/src.pro @@ -15,7 +15,7 @@ isEmpty(SYSTEM_QUAZIP) { DEFINES += QUAZIP_STATIC diff --git a/astro/mymoon/files/patch-configure b/astro/mymoon/files/patch-configure index 4e83da2d07f8..0efe65afcc50 100644 --- a/astro/mymoon/files/patch-configure +++ b/astro/mymoon/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Sat May 24 06:09:38 2003 -+++ configure Fri Oct 14 19:51:18 2005 -@@ -849,7 +849,7 @@ +--- configure.orig 2003-05-23 20:09:38 UTC ++++ configure +@@ -849,7 +849,7 @@ done PACKAGE=mymoon VERSION=1.0 @@ -9,7 +9,7 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -@@ -890,9 +890,9 @@ +@@ -890,9 +890,9 @@ fi done LNOVA_LIB_NAME="" @@ -22,7 +22,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -904,10 +904,10 @@ +@@ -904,10 +904,10 @@ cat > conftest.$ac_ext < +#include #include #include #include -@@ -59,7 +59,7 @@ +@@ -59,7 +59,7 @@ memset(&date2, 0, sizeof(date2)); memset(&date3, 0, sizeof(date3)); while (1) { @@ -15,7 +15,7 @@ age=moonphase(); -@@ -67,12 +67,12 @@ +@@ -67,12 +67,12 @@ if ( (latitude != 0) || (longitude != 0 observer.lng=latitude; observer.lat=longitude; } else {observer.lng=45.12;observer.lat=8.42;} diff --git a/astro/openuniverse/files/patch-src_comet.cpp b/astro/openuniverse/files/patch-src_comet.cpp index 2396b6492f5d..a8dd2baec728 100644 --- a/astro/openuniverse/files/patch-src_comet.cpp +++ b/astro/openuniverse/files/patch-src_comet.cpp @@ -1,6 +1,6 @@ ---- src/comet.cpp.orig Sat May 13 15:48:51 2000 -+++ src/comet.cpp Fri Mar 23 19:49:12 2001 -@@ -52,7 +52,7 @@ +--- src/comet.cpp.orig 2000-05-13 22:48:51 UTC ++++ src/comet.cpp +@@ -52,7 +52,7 @@ void CometTail(int body) #ifdef WIN32 wglPointParameterfvEXT(GL_DISTANCE_ATTENUATION_EXT, quad); #else diff --git a/astro/openuniverse/files/patch-a b/astro/openuniverse/files/patch-src_ou.cpp similarity index 59% rename from astro/openuniverse/files/patch-a rename to astro/openuniverse/files/patch-src_ou.cpp index 76b6ad6ad7f1..38cc3f4d10f4 100644 --- a/astro/openuniverse/files/patch-a +++ b/astro/openuniverse/files/patch-src_ou.cpp @@ -1,6 +1,5 @@ -diff -ruN src/ou.cpp.orig src/ou.cpp ---- src/ou.cpp.orig Sun Jun 4 21:29:29 2000 -+++ src/ou.cpp Sat Jun 10 07:37:23 2000 +--- src/ou.cpp.orig 2000-06-04 21:29:29 UTC ++++ src/ou.cpp @@ -22,7 +22,7 @@ #include #include diff --git a/astro/openuniverse/files/patch-src_ou.h b/astro/openuniverse/files/patch-src_ou.h index fbadc8fa3863..098eee0407e7 100644 --- a/astro/openuniverse/files/patch-src_ou.h +++ b/astro/openuniverse/files/patch-src_ou.h @@ -1,5 +1,5 @@ ---- src/ou.h.orig Sun Jun 4 12:35:09 2000 -+++ src/ou.h Tue Nov 5 12:17:24 2002 +--- src/ou.h.orig 2000-06-04 19:35:09 UTC ++++ src/ou.h @@ -19,6 +19,7 @@ #include diff --git a/astro/openuniverse/files/patch-b b/astro/openuniverse/files/patch-src_timeb.h similarity index 92% rename from astro/openuniverse/files/patch-b rename to astro/openuniverse/files/patch-src_timeb.h index f87af09f7600..8c2f67c51eae 100644 --- a/astro/openuniverse/files/patch-b +++ b/astro/openuniverse/files/patch-src_timeb.h @@ -1,6 +1,5 @@ -diff -ruN src/timeb.h.orig src/timeb.h ---- src/timeb.h.orig Thu Jan 1 00:00:00 1970 -+++ src/timeb.h Sat Jun 10 07:37:45 2000 +--- src/timeb.h.orig 2016-07-26 13:11:57 UTC ++++ src/timeb.h @@ -0,0 +1,46 @@ +/* Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. + This file is part of the GNU C Library. diff --git a/astro/osmium/files/patch-test-run__tests.sh b/astro/osmium/files/patch-test_run__tests.sh similarity index 80% rename from astro/osmium/files/patch-test-run__tests.sh rename to astro/osmium/files/patch-test_run__tests.sh index 8a7f46bcdd1d..388e09a86eac 100644 --- a/astro/osmium/files/patch-test-run__tests.sh +++ b/astro/osmium/files/patch-test_run__tests.sh @@ -1,5 +1,5 @@ ---- test/run_tests.sh.orig 2013-05-09 19:20:50.000000000 +0400 -+++ test/run_tests.sh 2013-05-23 00:01:42.140354335 +0400 +--- test/run_tests.sh.orig 2013-05-09 15:20:50 UTC ++++ test/run_tests.sh @@ -10,8 +10,10 @@ set -e diff --git a/astro/p5-Astro-FITS-CFITSIO/files/patch-Makefile.PL b/astro/p5-Astro-FITS-CFITSIO/files/patch-Makefile.PL index 8c7ba9a34c2d..b81c298f07d0 100644 --- a/astro/p5-Astro-FITS-CFITSIO/files/patch-Makefile.PL +++ b/astro/p5-Astro-FITS-CFITSIO/files/patch-Makefile.PL @@ -1,6 +1,6 @@ ---- Makefile.PL.orig 2012-01-22 01:52:49.000000000 -0500 -+++ Makefile.PL 2012-01-22 01:53:32.000000000 -0500 -@@ -22,9 +22,9 @@ +--- Makefile.PL.orig 2012-01-19 19:18:45 UTC ++++ Makefile.PL +@@ -22,9 +22,9 @@ FOUND_IT: { } } diff --git a/astro/phoon/files/patch-Makefile b/astro/phoon/files/patch-Makefile index f01683bd8fab..65fb53888e8c 100644 --- a/astro/phoon/files/patch-Makefile +++ b/astro/phoon/files/patch-Makefile @@ -1,5 +1,5 @@ ---- ./Makefile.orig 2003-01-21 04:04:36.000000000 +0100 -+++ ./Makefile 2014-02-12 22:39:19.404018490 +0100 +--- Makefile.orig 2003-01-21 03:04:36 UTC ++++ Makefile @@ -1,15 +1,15 @@ # Makefile for phoon @@ -21,7 +21,7 @@ all: phoon -@@ -24,7 +24,7 @@ +@@ -24,7 +24,7 @@ date_parse.o: date_parse.h astro.o: astro.h install: all diff --git a/astro/phoon/files/patch-astro.h b/astro/phoon/files/patch-astro.h index 22929650029c..74e0d9ab242c 100644 --- a/astro/phoon/files/patch-astro.h +++ b/astro/phoon/files/patch-astro.h @@ -1,6 +1,6 @@ ---- ./astro.h.orig 2003-01-28 01:55:32.000000000 +0100 -+++ ./astro.h 2014-02-12 22:38:52.437019902 +0100 -@@ -43,4 +43,4 @@ +--- astro.h.orig 2003-01-28 00:55:32 UTC ++++ astro.h +@@ -43,4 +43,4 @@ extern void phasehunt2( double sdate, do */ extern double phase( double pdate, double* pphase, double* mage, double* dist, double* angdia, double* sudist, double* suangdia ); diff --git a/astro/phoon/files/patch-phoon.c b/astro/phoon/files/patch-phoon.c index b59e6679f2cf..5922fc4271cd 100644 --- a/astro/phoon/files/patch-phoon.c +++ b/astro/phoon/files/patch-phoon.c @@ -1,6 +1,6 @@ ---- ./phoon.c.orig 2005-05-20 21:10:24.000000000 +0200 -+++ ./phoon.c 2014-02-12 22:38:52.438019914 +0100 -@@ -354,7 +354,7 @@ +--- phoon.c.orig 2005-05-20 19:10:24 UTC ++++ phoon.c +@@ -354,7 +354,7 @@ putmoon( time_t t, int numlines, char* a struct tm* tmP; double jd, pctphase, angphase, cphase, aom, cdist, cangdia, csund, csuang; double phases[2], which[2]; diff --git a/astro/py-astropy/files/patch-astropy_io_fits_setup__package.py b/astro/py-astropy/files/patch-astropy_io_fits_setup__package.py index 6926c24440a4..e1fa9457aea1 100644 --- a/astro/py-astropy/files/patch-astropy_io_fits_setup__package.py +++ b/astro/py-astropy/files/patch-astropy_io_fits_setup__package.py @@ -1,4 +1,4 @@ ---- astropy/io/fits/setup_package.py.orig 2016-07-02 18:54:36 UTC +--- astropy/io/fits/setup_package.py.orig 2016-03-10 22:20:43 UTC +++ astropy/io/fits/setup_package.py @@ -39,7 +39,7 @@ def _get_compression_extension(): '-Wno-uninitialized', '-Wno-format', diff --git a/astro/py-astropy/files/patch-astropy_wcs_setup__package.py b/astro/py-astropy/files/patch-astropy_wcs_setup__package.py index b4b0629e40e8..a2a12f28f3d8 100644 --- a/astro/py-astropy/files/patch-astropy_wcs_setup__package.py +++ b/astro/py-astropy/files/patch-astropy_wcs_setup__package.py @@ -1,4 +1,4 @@ ---- astropy/wcs/setup_package.py.orig 2016-07-02 18:53:24 UTC +--- astropy/wcs/setup_package.py.orig 2016-03-10 22:20:43 UTC +++ astropy/wcs/setup_package.py @@ -244,8 +244,7 @@ def get_wcslib_cfg(cfg, wcslib_files, in '-Wno-strict-prototypes', diff --git a/astro/qlandkartegt/files/patch-cmake-Modules-DefineInstallationPaths.cmake b/astro/qlandkartegt/files/patch-cmake_Modules_DefineInstallationPaths.cmake similarity index 100% rename from astro/qlandkartegt/files/patch-cmake-Modules-DefineInstallationPaths.cmake rename to astro/qlandkartegt/files/patch-cmake_Modules_DefineInstallationPaths.cmake diff --git a/astro/qmapshack/files/patch-cmake-Modules-DefineInstallationPaths.cmake b/astro/qmapshack/files/patch-cmake_Modules_DefineInstallationPaths.cmake similarity index 78% rename from astro/qmapshack/files/patch-cmake-Modules-DefineInstallationPaths.cmake rename to astro/qmapshack/files/patch-cmake_Modules_DefineInstallationPaths.cmake index c384115378a0..ad5a5abd31a5 100644 --- a/astro/qmapshack/files/patch-cmake-Modules-DefineInstallationPaths.cmake +++ b/astro/qmapshack/files/patch-cmake_Modules_DefineInstallationPaths.cmake @@ -1,4 +1,4 @@ ---- cmake/Modules/DefineInstallationPaths.cmake.orig 2015-05-22 16:29:44 UTC +--- cmake/Modules/DefineInstallationPaths.cmake.orig 2014-08-18 10:08:14 UTC +++ cmake/Modules/DefineInstallationPaths.cmake @@ -101,7 +101,7 @@ if (UNIX) FORCE diff --git a/astro/rmap/files/patch-main.c b/astro/rmap/files/patch-main.c index 781a7b095d17..4e08e2d79a44 100644 --- a/astro/rmap/files/patch-main.c +++ b/astro/rmap/files/patch-main.c @@ -1,6 +1,6 @@ ---- main.c.orig Tue Mar 28 17:01:17 2000 -+++ main.c Thu Mar 30 02:43:08 2000 -@@ -154,7 +154,7 @@ +--- main.c.orig 2000-03-28 16:01:17 UTC ++++ main.c +@@ -154,7 +154,7 @@ int main (int argc, char **argv) { case 'h': printf("Usage: rmap [--zoom=VALUE] [--xrot=VALUE] [--yrot=VALUE] [--zrot=VALUE]\n"); printf(" [--datafile=FILENAME] [--continent=LIST] [--category=LIST]\n"); diff --git a/astro/routino/files/patch-doc_Makefile b/astro/routino/files/patch-doc_Makefile index a4ac4da5356e..7e9b02313dd2 100644 --- a/astro/routino/files/patch-doc_Makefile +++ b/astro/routino/files/patch-doc_Makefile @@ -1,4 +1,4 @@ ---- doc/Makefile.orig 2016-06-04 17:01:05 UTC +--- doc/Makefile.orig 2014-03-22 11:28:26 UTC +++ doc/Makefile @@ -43,19 +43,19 @@ install: install-txt install-html install-txt: diff --git a/astro/routino/files/patch-extras_find-fixme_Makefile b/astro/routino/files/patch-extras_find-fixme_Makefile index 32ef40c00de8..11c825c8a07e 100644 --- a/astro/routino/files/patch-extras_find-fixme_Makefile +++ b/astro/routino/files/patch-extras_find-fixme_Makefile @@ -1,4 +1,4 @@ ---- extras/find-fixme/Makefile.orig 2016-06-04 17:12:29 UTC +--- extras/find-fixme/Makefile.orig 2016-02-09 19:05:19 UTC +++ extras/find-fixme/Makefile @@ -52,8 +52,8 @@ all-bin: $(EXE) @[ -d $(WEBBINDIR) ] || mkdir -p $(WEBBINDIR) diff --git a/astro/routino/files/patch-web_Makefile b/astro/routino/files/patch-web_Makefile index e87a7becd44d..68360567777f 100644 --- a/astro/routino/files/patch-web_Makefile +++ b/astro/routino/files/patch-web_Makefile @@ -1,4 +1,4 @@ ---- web/Makefile.orig 2016-06-04 17:03:11 UTC +--- web/Makefile.orig 2015-09-30 18:22:28 UTC +++ web/Makefile @@ -64,8 +64,8 @@ all-bin: all-exe @[ -d $(WEBBINDIR) ] || mkdir -p $(WEBBINDIR) diff --git a/astro/routino/files/patch-xml_Makefile b/astro/routino/files/patch-xml_Makefile index 690b3093f495..bea51b99e0a2 100644 --- a/astro/routino/files/patch-xml_Makefile +++ b/astro/routino/files/patch-xml_Makefile @@ -1,4 +1,4 @@ ---- xml/Makefile.orig 2016-06-04 17:08:07 UTC +--- xml/Makefile.orig 2015-05-28 18:03:07 UTC +++ xml/Makefile @@ -56,12 +56,12 @@ test: install: all diff --git a/astro/saoimage/files/patch-btnlib_makefile b/astro/saoimage/files/patch-btnlib_makefile index a556ab3fe672..d65f0aad01c0 100644 --- a/astro/saoimage/files/patch-btnlib_makefile +++ b/astro/saoimage/files/patch-btnlib_makefile @@ -1,5 +1,5 @@ ---- btnlib/makefile.orig Wed Dec 6 14:51:17 1995 -+++ btnlib/makefile Thu Sep 24 15:54:53 1998 +--- btnlib/makefile.orig 1995-12-06 20:51:17 UTC ++++ btnlib/makefile @@ -8,7 +8,7 @@ # the library would build. It is preferable to build btnlib as part of the # make procedure in the parent SAOimage directory. @@ -9,7 +9,7 @@ LINT = lint RANLIB = ranlib -@@ -27,7 +27,7 @@ +@@ -27,7 +27,7 @@ OBJS = attach.o draw.o event.o border. press.o remote.o resize.o util.o LIB = libbtn.a diff --git a/astro/saoimage/files/patch-disppsct.c b/astro/saoimage/files/patch-disppsct.c index 159f9586512c..0aa347de9877 100644 --- a/astro/saoimage/files/patch-disppsct.c +++ b/astro/saoimage/files/patch-disppsct.c @@ -1,6 +1,6 @@ ---- disppsct.c.orig Sun Jan 16 23:45:17 2000 -+++ disppsct.c Sun Jan 16 23:53:18 2000 -@@ -598,7 +598,7 @@ +--- disppsct.c.orig 2003-09-03 18:23:08 UTC ++++ disppsct.c +@@ -599,7 +599,7 @@ static char *make_label() char *getenv(); #endif diff --git a/astro/saoimage/files/patch-gcc4 b/astro/saoimage/files/patch-gcc4 index 64cc64a6bf7e..4483e5e976c3 100644 --- a/astro/saoimage/files/patch-gcc4 +++ b/astro/saoimage/files/patch-gcc4 @@ -1,6 +1,6 @@ ---- btnlib/border.c.orig Fri May 5 00:21:13 1995 -+++ btnlib/border.c Fri Jun 29 11:08:51 2007 -@@ -35,6 +35,10 @@ +--- btnlib/border.c.orig 1995-05-04 17:21:13 UTC ++++ btnlib/border.c +@@ -35,6 +35,10 @@ static char SccsId[] = "%W% %G%"; * Note: For each byte, bit 0 (0x01) appears on the left. * Note: For each byte, bit 7 (0x80) appears on the right. */ @@ -11,7 +11,7 @@ void btn_MakeBdrBitmap ( buttonmap, width, height, byte_width, form, inverse ) unsigned char *buttonmap; /* i,o: pointer to bitmap of button */ int width, height; /* i: dimensions of button window (to cover) */ -@@ -52,8 +56,6 @@ +@@ -52,8 +56,6 @@ void btn_MakeBdrBitmap ( buttonmap, widt int right_form_bit; /* l: bit in first right form byte to use */ int right_bdr_byte; /* l: index of first line byte for right bdr */ int right_bdr_bit; /* l: bit in first line byte for right bdr */ @@ -20,7 +20,7 @@ /* portion of pattern form used (clip overlap if button very small) */ /* middle overlap on odd size counted for height, omitted for width */ -@@ -119,6 +121,9 @@ +@@ -119,6 +121,9 @@ void btn_MakeBdrBitmap ( buttonmap, widt * Subroutine: btn_MakeBdrLine * Purpose: set the bits for one line of the button's border */ @@ -30,7 +30,7 @@ static void btn_MakeBdrLine ( line, form, byte_width, inverse, right_bdr_byte, right_bdr_bit, right_form_byte, right_form_bit ) -@@ -131,7 +136,6 @@ +@@ -131,7 +136,6 @@ static void btn_MakeBdrLine ( line, form int right_bdr_byte; /* l: index of first line byte for right bdr */ int right_bdr_bit; /* l: bit in first line byte for right bdr */ { @@ -38,9 +38,9 @@ /* copy in top left, store reverse for top right */ *line = *form; *(line+1) = *(++form); ---- btnlib/create.c.orig Sun Apr 29 04:17:46 1990 -+++ btnlib/create.c Fri Jun 29 11:09:21 2007 -@@ -53,6 +53,9 @@ +--- btnlib/create.c.orig 1990-04-28 20:17:46 UTC ++++ btnlib/create.c +@@ -53,6 +53,9 @@ static GC def_gc = NULL; * Note: Buttonboxes must later be combined into menus and panels * Note: Call TouchButton to activate buttons and submenus when ready */ @@ -50,7 +50,7 @@ ButtonBox MakeButtonBox ( parent, gc, visual, background, geo, defs, borders ) BoxParent *parent; /* i: Parent window info */ GC gc; /* i: graphics context for drawing labels */ -@@ -70,7 +73,6 @@ +@@ -70,7 +73,6 @@ ButtonBox MakeButtonBox ( parent, gc, vi int x, y; /* l: coordinates of box in parent */ int i; /* l: loop counter */ char *btn_Alloc(); @@ -58,9 +58,9 @@ void btn_LabelButtons(), btn_Dimensions(); /* allocate the space for the new record */ ---- btnlib/draw.c.orig Sat Jun 22 06:40:21 1991 -+++ btnlib/draw.c Fri Jun 29 11:06:53 2007 -@@ -103,11 +103,13 @@ +--- btnlib/draw.c.orig 1991-06-21 23:40:21 UTC ++++ btnlib/draw.c +@@ -103,11 +103,13 @@ void btn_PutImage ( button, phase ) * Xlib calls: none * Method: Dim this box and all co-menu boxes */ @@ -75,7 +75,7 @@ btn_DimButtons(buttonbox); for( i=0; i < buttonbox->co_menu_count; i++ ) { -@@ -153,11 +155,13 @@ +@@ -153,11 +155,13 @@ static void btn_DimButtons ( buttonbox ) * Uses: btn_LightButtons() below * Xlib calls: none */ @@ -90,9 +90,9 @@ btn_LightButtons(buttonbox); for( i=0; i < buttonbox->co_menu_count; i++ ) { ---- btnlib/event.c.orig Fri May 5 00:27:33 1995 -+++ btnlib/event.c Fri Jun 29 11:07:53 2007 -@@ -52,12 +52,14 @@ +--- btnlib/event.c.orig 1995-05-04 17:27:33 UTC ++++ btnlib/event.c +@@ -52,12 +52,14 @@ static int select_size=0; * with their active submenus. * Note: Must be called with a buttonbox at the base of the menu tree */ @@ -108,7 +108,7 @@ /* is the event in the primary buttonbox (or its sub-menus) */ if( btn_Event(buttonbox, event) != 0 ) { -@@ -139,6 +141,10 @@ +@@ -139,6 +141,10 @@ static int btn_Event ( buttonbox, event * with their active submenus. * Note: Must be called with a buttonbox at the base of the menu tree */ @@ -119,7 +119,7 @@ int ButtonControl ( buttonbox, event, response ) ButtonBox buttonbox; /* i: top handle for button menu group */ XEvent *event; /* i: pointer to filled event record */ -@@ -147,8 +153,6 @@ +@@ -147,8 +153,6 @@ int ButtonControl ( buttonbox, event, re int status; /* o: reason for return code (-1,0,1) */ int not_found; /* l: event search status */ int i; /* l: loop counter */ @@ -128,7 +128,7 @@ status = 1; *response = NULL; -@@ -206,6 +210,9 @@ +@@ -206,6 +210,9 @@ int ButtonControl ( buttonbox, event, re * until one fields it. If still not, return NULL, else (it * was fielded) get the next event and loop again. */ @@ -138,7 +138,7 @@ static int btn_Control ( buttonbox, event, response ) ButtonBox buttonbox; /* i: top handle for button menu tree */ XEvent *event; /* i: pointer to filled event record */ -@@ -218,7 +225,6 @@ +@@ -218,7 +225,6 @@ static int btn_Control ( buttonbox, even int type; /* l: temp for button response type */ int id; /* l: temp for button id */ int mask[2]; /* l: temp store for select mask (select changes it) */ @@ -146,9 +146,9 @@ int btn_PushButton(); void btn_PutImage(), btn_DrawButton(), btn_ReleaseButton(); ---- btnlib/image.c.orig Sun Aug 4 05:42:11 1991 -+++ btnlib/image.c Fri Jun 29 11:10:36 2007 -@@ -38,6 +38,9 @@ +--- btnlib/image.c.orig 1991-08-03 22:42:11 UTC ++++ btnlib/image.c +@@ -38,6 +38,9 @@ static char SccsId[] = "%W% %G%"; * Post-state: off_out, off_in, on_out, on_in XImage's set in button record. * Exception: Only labels present are installed. */ @@ -158,7 +158,7 @@ void btn_MakeXImages ( button, width, height, byte_width, visual, off_out, off_in, on_out, on_in, mapsz, off, on, motf ) ButtonRecord *button; /* i: main structure describing button */ -@@ -56,7 +59,6 @@ +@@ -56,7 +59,6 @@ void btn_MakeXImages ( button, width, he unsigned char *data; /* l: pointer to bitmap currently processing */ XImage *ximage; char *btn_Alloc(); @@ -166,7 +166,7 @@ #ifdef ALLIANT extern int nbutton; -@@ -173,6 +175,9 @@ +@@ -173,6 +175,9 @@ void btn_MakeXImages ( button, width, he * Exception: Label is not stenciled if one dimension would be zero. * Method: Get basic alignment parameters and call btn_StencilLabel(); */ @@ -176,7 +176,7 @@ static void btn_AddLabel ( label, width, height, byte_width, bitmap, inverse ) ButtonLabel *label; /* i: record of label bitmap to stencil in */ int width; /* i: width in pixels of button */ -@@ -185,7 +190,6 @@ +@@ -185,7 +190,6 @@ static void btn_AddLabel ( label, width, int dst_x, dst_y; /* l: coords of start of stencil in dst (button) */ int xwdth; /* l: width (cols) to stencil */ int yhght; /* l: number of lines (rows) to stencil */ @@ -184,9 +184,9 @@ void btn_StencilLabel(); if( ((xwdth = btn_LabelX(label, width, &src_x, &dst_x)) > 0) && ---- btnlib/label.c.orig Fri May 5 00:19:37 1995 -+++ btnlib/label.c Fri Jun 29 11:09:45 2007 -@@ -42,6 +42,10 @@ +--- btnlib/label.c.orig 1995-05-04 17:19:37 UTC ++++ btnlib/label.c +@@ -42,6 +42,10 @@ static unsigned char lmask[8] = { 0x01,0 * Note: For each byte, bit 0 (0x01) appears on the left. * Note: For each byte, bit 7 (0x80) appears on the right. */ @@ -197,19 +197,19 @@ void btn_StencilLabel ( src, msk, dst, src_byte_width, dst_byte_width, src_x, src_y, dst_x, dst_y, width, height, inverse ) unsigned char *src; /* i: ptr to first byte of pattern */ -@@ -65,9 +69,6 @@ - unsigned char *last_dst; /* l: ptr to last byte used in first line */ +@@ -66,9 +70,6 @@ void btn_StencilLabel ( src, msk, dst, s int first_mask; /* l: bit mask, with coded sign (see above) */ int last_mask; /* l: bit mask, with coded sign (see above) */ -- + - static void btn_Stencil(), btn_StencilInv(); - static void btn_StencilAlligned(),btn_StencilAllignedInv(); - +- /* advance src and msk to their first used bytes */ byte_offset = (src_y * src_byte_width) + (src_x / 8); ---- btnlib/mount.c.orig Sat Apr 21 05:56:27 1990 -+++ btnlib/mount.c Fri Jun 29 11:11:16 2007 -@@ -35,11 +35,13 @@ + src += byte_offset; +--- btnlib/mount.c.orig 1990-04-20 21:56:27 UTC ++++ btnlib/mount.c +@@ -35,11 +35,13 @@ static char SccsId[] = "%W% %G%"; * Xlib calls: none * Note: This routine moves latterally to cover co-menus */ @@ -224,7 +224,7 @@ btn_MapButtonbox(buttonbox); for( i = 0; i < buttonbox->co_menu_count; i++ ) -@@ -109,6 +111,9 @@ +@@ -109,6 +111,9 @@ static void btn_UnmapButtonbox ( buttonb * map submenus of new button. * Note: Unmapping submenus is harmless if they were not mapped. */ @@ -234,7 +234,7 @@ void btn_ReplaceSubmenus ( buttonbox, btn, op_num, mapping ) ButtonBox buttonbox; int btn; -@@ -116,7 +121,6 @@ +@@ -116,7 +121,6 @@ void btn_ReplaceSubmenus ( buttonbox, bt int mapping; /* i: switch allows suppression of mapping */ { int i; @@ -242,7 +242,7 @@ /* clear out the old submenus */ for( i=0; i < buttonbox->submenu_count; i++ ) -@@ -149,6 +153,9 @@ +@@ -149,6 +153,9 @@ void btn_ReplaceSubmenus ( buttonbox, bt * Note: Requires search through co-menus * Note: Unmapping cosubmenus is harmless if they were not mapped. */ @@ -252,7 +252,7 @@ void btn_ReplaceCosubmenus ( buttonbox, btn, op_num, mapping ) ButtonBox buttonbox; int btn; -@@ -156,7 +163,6 @@ +@@ -156,7 +163,6 @@ void btn_ReplaceCosubmenus ( buttonbox, int mapping; /* i: switch allows suppression of mapping */ { int i, j; @@ -260,9 +260,9 @@ /* check to see if we have the co-mode submenus */ if( buttonbox->cosubmenu_count > 0 ) { ---- btnlib/resize.c.orig Sat Apr 21 06:15:57 1990 -+++ btnlib/resize.c Fri Jun 29 11:11:35 2007 -@@ -33,12 +33,14 @@ +--- btnlib/resize.c.orig 1990-04-20 22:15:57 UTC ++++ btnlib/resize.c +@@ -33,12 +33,14 @@ static char SccsId[] = "%W% %G%"; * Post-state: All buttonboxes having given parent are resized to fill * Method: Call btn_ChkResize with this menu and then its co-menus. */ @@ -278,9 +278,9 @@ /* check this buttonbox */ btn_ChkResize(buttonbox, parent); ---- clralloc.c.orig Thu May 13 01:40:45 1999 -+++ clralloc.c Fri Jun 29 11:12:28 2007 -@@ -39,12 +39,14 @@ +--- clralloc.c.orig 1999-05-12 18:40:45 UTC ++++ clralloc.c +@@ -39,12 +39,14 @@ static unsigned long overlay_mask; /* fo * Method: Try for at least min cells in default colormap, if failed * try to create a private colormap. */ @@ -297,9 +297,9 @@ if( (color->map.default_permit != NO) && (color->map.default_enable == YES) && ---- clrctrl.c.orig Fri Apr 20 22:43:37 1990 -+++ clrctrl.c Fri Jun 29 11:13:02 2007 -@@ -36,13 +36,15 @@ +--- clrctrl.c.orig 1990-04-20 14:43:37 UTC ++++ clrctrl.c +@@ -36,13 +36,15 @@ extern struct cgraphRec cgraph; * Subroutine: select_color * Purpose: Things to do when a buttonbox color menu button is selected */ @@ -316,7 +316,7 @@ if( control.response[0] == VOP ) { switch( control.response[1] ) { -@@ -218,10 +220,12 @@ +@@ -218,10 +220,12 @@ static void new_color_table ( map_code ) * Purpose: Reverse all colors at once (respond to invert button) * Xlib call: XStoreColors() */ @@ -330,9 +330,9 @@ /* invert color tables and remake storemap */ invert_table(&color.ctable.red); ---- clrhard.c.orig Fri Apr 20 21:54:21 1990 -+++ clrhard.c Fri Jun 29 11:30:10 2007 -@@ -29,11 +29,13 @@ +--- clrhard.c.orig 1990-04-20 13:54:21 UTC ++++ clrhard.c +@@ -29,11 +29,13 @@ static char SccsId[] = "%W% %G%"; * Subroutine: init_hard_colors * Purpose: Set up basic hardware colors */ @@ -347,7 +347,7 @@ color->hard.red = get_hard_color(color->display, colormap, "red", 63000, 0, 0); -@@ -58,12 +60,14 @@ +@@ -58,12 +60,14 @@ void init_hard_colors ( color, colormap * Subroutine: lookup_cursor_colors * Purpose: Get color parameters from named cursor colors */ @@ -363,7 +363,7 @@ /* update xcolor structs if needed */ if( init || (color->cur.desired_cur != NULL) ) { -@@ -90,12 +94,14 @@ +@@ -90,12 +94,14 @@ void lookup_cursor_colors ( color, color * Pre-state: XColor for cur, one, and two, initialized * Post-state: Pixel values for one and two set, that for cur returned. */ @@ -379,7 +379,7 @@ if( (color->cur.disp_one = alloc_hard_color(color->display, colormap, &color->cur.color_one)) < 0 ) -@@ -113,10 +119,12 @@ +@@ -113,10 +119,12 @@ int alloc_cursor_cell_color ( color, col * Subroutine: free_cursor_cell_color * Purpose: Free cell color overlay colors */ @@ -393,9 +393,9 @@ free_readonly_color(color, (int)color->cur.color_one.pixel); free_readonly_color(color, (int)color->cur.color_two.pixel); ---- clrinit.c.orig Sat Dec 15 05:17:55 2001 -+++ clrinit.c Fri Jun 29 11:30:25 2007 -@@ -38,6 +38,9 @@ +--- clrinit.c.orig 2001-12-14 23:17:55 UTC ++++ clrinit.c +@@ -38,6 +38,9 @@ static Display *display; * Subroutine: init_color * Purpose: Claim and set up colors (and do any needed initial work) */ @@ -405,7 +405,7 @@ void init_color ( color, init ) struct colorRec *color; int init; -@@ -46,7 +49,6 @@ +@@ -46,7 +49,6 @@ void init_color ( color, init ) void exit_errmsg(), init_hard_colors(), init_halftone(); void free_color_cells(), lookup_cursor_colors(), free_cursor_cell_color(); void init_overlay_color(), init_cell_color(), init_halftone_color(); @@ -413,9 +413,9 @@ if( init ) { display = color->display; ---- clrmenu.c.orig Sun Apr 29 06:40:14 1990 -+++ clrmenu.c Fri Jun 29 11:31:13 2007 -@@ -35,14 +35,16 @@ +--- clrmenu.c.orig 1990-04-28 22:40:14 UTC ++++ clrmenu.c +@@ -35,14 +35,16 @@ EditStruct *color_edit; /* key to popup * Purpose: Get a new pre-defined color table and load it for use * Returns: 1 if succeeded, else 0 */ @@ -434,7 +434,7 @@ switch( table_code ) { case MOP_Init_A: -@@ -111,13 +113,15 @@ +@@ -111,13 +113,15 @@ static ColorTable *read_color_file ( ) * Subroutine: write_color_file * Purpose: Open and write a color table file */ @@ -451,7 +451,7 @@ EditStruct *init_edit_popup(); int open_output_file(); void timestamp(); -@@ -189,11 +193,13 @@ +@@ -189,11 +193,13 @@ static void print_one_color ( fp, table * Subroutine: load_newtable * Purpose: Load an internally stored color table for use */ @@ -466,9 +466,9 @@ load_subtable(&ctable->red, &new->red); load_subtable(&ctable->green, &new->green); ---- clrread.c.orig Sun Apr 29 07:30:35 1990 -+++ clrread.c Fri Jun 29 11:31:49 2007 -@@ -25,6 +25,9 @@ +--- clrread.c.orig 1990-04-28 23:30:35 UTC ++++ clrread.c +@@ -25,6 +25,9 @@ static char SccsId[] = "%W% %G%"; * Subroutine: parse_color_file * Purpose: Parse values after color identifier */ @@ -478,7 +478,7 @@ int parse_color_file ( fp, ctable, max_entries ) ColorTable *ctable; int max_entries; -@@ -35,7 +38,6 @@ +@@ -35,7 +38,6 @@ int parse_color_file ( fp, ctable, max_e char line[SZ_LINE]; char cbuf[SZ_LINE]; struct SubTable *table; @@ -486,7 +486,7 @@ line_num = 0; /* advance to first non-comment line */ -@@ -95,6 +97,9 @@ +@@ -95,6 +97,9 @@ int parse_color_file ( fp, ctable, max_e * Purpose: Read color table entries for one color * Note: Values may start with word "gamma" and its value */ @@ -496,7 +496,7 @@ static int parse_color_table ( fp, line, cbuf, i, len, line_num, farb, max_entries, color_cnt ) FILE *fp; -@@ -110,7 +115,6 @@ +@@ -110,7 +115,6 @@ static int parse_color_table ( fp, line, float level, intensity; char *level_token, *intensity_token; int status, entry; @@ -504,7 +504,7 @@ int check_parens(); char *next_token(); -@@ -227,6 +231,9 @@ +@@ -227,6 +231,9 @@ static int parse_color_table ( fp, line, * Negative val if string starts with a number or paren * 0 if file ended, or first character was neither char nor num */ @@ -514,7 +514,7 @@ static int advance_to_ascii ( fp, line, scratch, len, line_num, dont_end ) FILE *fp; /* i: file descriptor */ char *line; /* i: buffer to get entire line */ -@@ -236,7 +243,6 @@ +@@ -236,7 +243,6 @@ static int advance_to_ascii ( fp, line, int dont_end; /* flag that more is definitely expected */ { int i; @@ -522,9 +522,9 @@ int check_parens(); /* advance to first non-comment line */ ---- clrsetup.c.orig Sun Jun 3 12:07:29 1990 -+++ clrsetup.c Fri Jun 29 11:32:20 2007 -@@ -29,12 +29,14 @@ +--- clrsetup.c.orig 1990-06-03 04:07:29 UTC ++++ clrsetup.c +@@ -29,12 +29,14 @@ static char SccsId[] = "%W% %G%"; * Purpose: Set up color parameters unique to overlay type usage * Xlib calls: XStoreColors() */ @@ -540,7 +540,7 @@ init_cellstore(color->cellstore, color->pixvalmap, color->ncolors); /* color in the cursor range of the color map */ -@@ -75,12 +77,14 @@ +@@ -75,12 +77,14 @@ void init_overlay_color ( color ) * Purpose: Set up color parameters unique to cell usage without overlay * Xlib calls: XStoreColors() */ @@ -556,9 +556,9 @@ init_cellstore(color->cellstore, color->pixvalmap, color->ncolors); /* Not cursor plane */ ---- clrvary.c.orig Fri Apr 20 21:57:20 1990 -+++ clrvary.c Fri Jun 29 11:32:33 2007 -@@ -130,6 +130,9 @@ +--- clrvary.c.orig 1990-04-20 13:57:20 UTC ++++ clrvary.c +@@ -130,6 +130,9 @@ void vary_colors ( event, mode, track, x * Subroutine: vary_contrast_and_bias * Purpose: change color table cell_levels as per new contrast and bias */ @@ -568,7 +568,7 @@ void vary_contrast_and_bias ( table, contrast, bias ) struct subtableRec *table; double contrast; /* i: normal = 1.0 */ -@@ -137,7 +140,6 @@ +@@ -137,7 +140,6 @@ void vary_contrast_and_bias ( table, con { double *base_level, *cell_level; int vertex_cnt; @@ -576,9 +576,9 @@ base_level = table->base_level; cell_level = table->cell_level; ---- cmdnew.c.orig Fri Jun 6 21:52:04 1997 -+++ cmdnew.c Fri Jun 29 11:33:12 2007 -@@ -73,9 +73,11 @@ +--- cmdnew.c.orig 1997-06-06 14:52:04 UTC ++++ cmdnew.c +@@ -73,9 +73,11 @@ static char *prompt = "Enter new image f * Called by: key_response() in MainKey.c * Called by: select_environment() in MainSelect.c */ @@ -591,7 +591,7 @@ int get_edit_input(); EditStruct *init_edit_popup(); -@@ -95,6 +97,11 @@ +@@ -95,6 +97,11 @@ void get_new_cmd ( ) * Purpose: Given a new command line, parse it and do what is called for * Returns: 1 = success, 0 = user decided not to do anything, -1 = error */ @@ -603,7 +603,7 @@ static int new_command ( input_line ) char *input_line; { -@@ -104,9 +111,6 @@ +@@ -104,9 +111,6 @@ static int new_command ( input_line ) int headersize; int parse_cmdline(), check_image(); void reinit_color(), redraw_magnifier(), touch_submenu_button(); @@ -613,9 +613,9 @@ /* store some key initial values */ headersize = img.headersize; ---- cmdparse.c.orig Tue Apr 9 02:26:55 2002 -+++ cmdparse.c Fri Jun 29 11:33:24 2007 -@@ -47,6 +47,9 @@ +--- cmdparse.c.orig 2002-04-08 19:26:55 UTC ++++ cmdparse.c +@@ -47,6 +47,9 @@ extern int bad_buttons; * Purpose: Process options to set filename and change defaults * Returns: -1 on error, 0 OK but no filename, 1 OK and new filename given */ @@ -625,7 +625,7 @@ int parse_cmdline ( argc, argv, displayname ) int argc; char *argv[]; -@@ -58,7 +61,6 @@ +@@ -58,7 +61,6 @@ int parse_cmdline ( argc, argv, displayn int parse_rotate(), parse_scale(), parse_color(), parse_fileread(), usage(); int parse_cursor(); void init_cmdline(); @@ -633,9 +633,9 @@ if( displayname != NULL ) { /* if initial program command line, strip off program name, store line */ ---- crdinvrt.c.orig Fri Apr 20 22:00:26 1990 -+++ crdinvrt.c Fri Jun 29 11:33:51 2007 -@@ -28,12 +28,14 @@ +--- crdinvrt.c.orig 1990-04-20 14:00:26 UTC ++++ crdinvrt.c +@@ -28,12 +28,14 @@ static char SccsId[] = "%W% %G%"; * Purpose: Compute parameters of the inverse transform * Method: Uses LU decomposition method */ @@ -651,7 +651,7 @@ scratch[0][0] = old->inx_outx; scratch[1][0] = old->iny_outx; -@@ -65,13 +67,15 @@ +@@ -65,13 +67,15 @@ void invert_matrix ( old, new ) * Purpose: Compute the offsets used for integer transforms * Method: Uses matrix inversion */ @@ -668,9 +668,9 @@ /* set transform equations in matrix form */ scratch[0][0] = old->inx_outx; ---- crdrot.c.orig Fri Apr 20 22:00:51 1990 -+++ crdrot.c Fri Jun 29 11:35:13 2007 -@@ -55,6 +55,9 @@ +--- crdrot.c.orig 1990-04-20 14:00:51 UTC ++++ crdrot.c +@@ -55,6 +55,9 @@ static char SccsId[] = "%W% %G%"; * As each transform is applied to the front, we apply them in reverse order * the result is, from img->A,B,C,imgtofile(as given)->file */ @@ -680,7 +680,7 @@ void rotate_transform ( img, imgtofile, flip, rotcode ) Coordsys *img; Transform *imgtofile; -@@ -63,7 +66,6 @@ +@@ -63,7 +66,6 @@ void rotate_transform ( img, imgtofile, { double xmove, ymove; int angle; @@ -688,7 +688,7 @@ /* if no rotation, do nothing */ if( (rotcode == 0) && (flip == 0) ) return; -@@ -93,6 +95,9 @@ +@@ -93,6 +95,9 @@ void rotate_transform ( img, imgtofile, * Note: ioff is not used for turn or flip, as it is assumed that both * will be bracketed between two moves (to place origin at center) */ @@ -698,7 +698,7 @@ static void move_mtrx ( mtrx, xtran, ytran, ioff, prior ) Transform *mtrx; double xtran, ytran; -@@ -100,7 +105,6 @@ +@@ -100,7 +105,6 @@ static void move_mtrx ( mtrx, xtran, ytr int prior; { Transform translate; @@ -706,7 +706,7 @@ bzero((char *)(&translate), sizeof(Transform)); translate.inx_outx = 1.0; -@@ -119,12 +123,14 @@ +@@ -119,12 +123,14 @@ static void move_mtrx ( mtrx, xtran, ytr * Subroutine: flip_mtrx * Purpose: Apply a mirror reflection to the passed Transform */ @@ -722,7 +722,7 @@ bzero((char *)(&reflect), sizeof(Transform)); reflect.inx_outx = 1.0; -@@ -141,6 +147,9 @@ +@@ -141,6 +147,9 @@ static void flip_mtrx ( mtrx, prior ) * Note: the pivot is 0,0 of the passed Transform's coordinate system * Exception: only multiples of 90 degrees are allowed */ @@ -732,7 +732,7 @@ static void turn_mtrx ( mtrx, angle, prior ) Transform *mtrx; int angle; -@@ -148,7 +157,6 @@ +@@ -148,7 +157,6 @@ static void turn_mtrx ( mtrx, angle, pri { Transform rotate; void exit_errmsg(); @@ -740,9 +740,9 @@ while( angle >= 360 ) angle -= 360; while( angle < 0 ) angle += 360; ---- crdsynth.c.orig Fri Apr 20 22:01:55 1990 -+++ crdsynth.c Fri Jun 29 11:35:34 2007 -@@ -147,11 +147,13 @@ +--- crdsynth.c.orig 1990-04-20 14:01:55 UTC ++++ crdsynth.c +@@ -147,11 +147,13 @@ void combine_transform ( new, first, sec * Subroutine: set_trans_speed * Purpose: Set parameters for fast integer computation */ @@ -757,9 +757,9 @@ trans->ixzoom = 0; trans->iyzoom = 0; ---- crdtemp.c.orig Tue Feb 27 02:14:19 1996 -+++ crdtemp.c Fri Jun 29 11:35:55 2007 -@@ -126,6 +126,9 @@ +--- crdtemp.c.orig 1996-02-26 20:14:19 UTC ++++ crdtemp.c +@@ -126,6 +126,9 @@ void set_disptran ( coord ) * Purpose: set up zoom given edges of desired display and * appropriate img transform */ @@ -769,7 +769,7 @@ void panedge_zoom ( coord, wintoimgtrans, win_x, win_y ) struct coordRec *coord; /* i: collected coords */ Transform *wintoimgtrans; /* i: transform from mouse's window to img */ -@@ -134,7 +137,6 @@ +@@ -134,7 +137,6 @@ void panedge_zoom ( coord, wintoimgtrans float imgX, imgY; int box_width, box_height; void i_transform(); @@ -777,9 +777,9 @@ /* calculate image coordinates of win_x and win_y */ i_transform(wintoimgtrans, win_x, win_y, &imgX, &imgY); ---- csrarea.c.orig Fri Apr 20 22:07:03 1990 -+++ csrarea.c Fri Jun 29 11:36:28 2007 -@@ -28,13 +28,15 @@ +--- csrarea.c.orig 1990-04-20 14:07:03 UTC ++++ csrarea.c +@@ -28,13 +28,15 @@ static char SccsId[] = "%W% %G%"; * Purpose: Calculate area, in float units file pixels, enclosed by cursor * Method: Use mathematical formula appropriate to cursor type */ @@ -796,7 +796,7 @@ switch( cursor->type ) { case COP_Circle: -@@ -83,13 +85,15 @@ +@@ -83,13 +85,15 @@ static double x11, y11, x12, y12; * are not tested since neighbors cannot cross but neighbors do * share a common point. */ @@ -813,9 +813,9 @@ if( (i+2) >= cnt ) { return( 0 ); ---- csrgrab.c.orig Fri Apr 20 22:08:42 1990 -+++ csrgrab.c Fri Jun 29 11:37:13 2007 -@@ -38,12 +38,14 @@ +--- csrgrab.c.orig 1990-04-20 14:08:42 UTC ++++ csrgrab.c +@@ -38,12 +38,14 @@ extern struct colorRec color; /* need to * Purpose: Change size of cursor to intersect current mouse cursor * while keeping aspect ratio of cursor constant */ @@ -831,7 +831,7 @@ /* if this event is initiating tracking, don't erase the cursor */ if( event->type == MotionNotify ) -@@ -64,13 +66,15 @@ +@@ -64,13 +66,15 @@ void size_annuli ( cursor, event ) * Purpose: Respond to a mouse request to delete an annulus * */ @@ -849,7 +849,7 @@ /* if there are two or more annuli */ if( (cursor->next_annulus != 0) && -@@ -169,14 +173,16 @@ +@@ -169,14 +173,16 @@ static void remove_annulus ( parent ) * Purpose: Set up cursor to for a size annulus interaction * Called by: size_annuli() */ @@ -868,9 +868,9 @@ code = on_annulus(cursor, &parent); /* decide what to draw */ ---- csrpoly1.c.orig Fri Apr 20 22:11:54 1990 -+++ csrpoly1.c Fri Jun 29 11:37:39 2007 -@@ -36,6 +36,9 @@ +--- csrpoly1.c.orig 1990-04-20 14:11:54 UTC ++++ csrpoly1.c +@@ -36,6 +36,9 @@ extern struct colorRec color; /* need to * Used when initiating a move or size action * Called by: control_cursor() in CursorCtrl.c */ @@ -880,7 +880,7 @@ void grab_polygon_vertex ( cursor, event, size ) struct cursorRec *cursor; XEvent *event; /* i: XbuttonEvent (ButtonPress) for x & y */ -@@ -45,7 +48,6 @@ +@@ -45,7 +48,6 @@ void grab_polygon_vertex ( cursor, event int pt; /* l: index of polygon vertex */ int closest_polygon_line(); void draw_cursor(), add_polygon_vertex(); @@ -888,7 +888,7 @@ /* erase existing cursor */ draw_cursor(cursor, &color.gcset.undraw); -@@ -84,13 +86,15 @@ +@@ -84,13 +86,15 @@ void grab_polygon_vertex ( cursor, event * Returns: 1 if image must be redrawn, else 0 * Called by: control_cursor() in CursorCtrl.c */ @@ -905,9 +905,9 @@ i = on_polygon_vertex((int)event->xbutton.x, (int)event->xbutton.y, cursor->points, cursor->poly_cnt); ---- csrpoly2.c.orig Thu Jul 9 23:29:27 1998 -+++ csrpoly2.c Fri Jun 29 11:37:55 2007 -@@ -72,12 +72,14 @@ +--- csrpoly2.c.orig 1998-07-09 16:29:27 UTC ++++ csrpoly2.c +@@ -72,12 +72,14 @@ void collapse_polygon ( cursor ) * Subroutine: start_polygon * Purpose: Install polygon drawing stuff for the active cursor */ @@ -923,9 +923,9 @@ if( polysz == 0 ) init_polygon(); ---- csrpoly3.c.orig Fri Apr 20 22:11:40 1990 -+++ csrpoly3.c Fri Jun 29 11:38:09 2007 -@@ -28,6 +28,9 @@ +--- csrpoly3.c.orig 1990-04-20 14:11:40 UTC ++++ csrpoly3.c +@@ -28,6 +28,9 @@ static char SccsId[] = "%W% %G%"; * vector from pointer to closest point on segment * Method: top down search */ @@ -935,7 +935,7 @@ int closest_polygon_line ( x, y, vertex, cnt ) int x, y; XPoint *vertex; -@@ -38,7 +41,6 @@ +@@ -38,7 +41,6 @@ int closest_polygon_line ( x, y, vertex, int min_endpoint, endpoint; int min_j; int i, j; @@ -943,9 +943,9 @@ min_distance = 1.0E30; min_j = 0; ---- csrshape.c.orig Tue Oct 20 01:46:41 1998 -+++ csrshape.c Fri Jun 29 11:40:32 2007 -@@ -31,9 +31,6 @@ +--- csrshape.c.orig 1998-10-19 18:46:41 UTC ++++ csrshape.c +@@ -31,9 +31,6 @@ static char SccsId[] = "%W% %G%"; #include "defs/circle.def" /* Define Unit_circles */ @@ -955,7 +955,7 @@ void make_cursor( struct cursorRec *cursor); static int make_arrow( double xtip, double ytip, double xray, double rotsin, double rotcos, XPoint *points); -@@ -41,28 +38,20 @@ +@@ -41,28 +38,20 @@ static int make_boxcur( double xcen, dou double xray, double yray, double rotsin, double rotcos, XPoint *points); static int make_circur( double xcen, double ycen, double radius, @@ -990,9 +990,9 @@ /* Declare and initialize drawing tools */ double *UnitPieX = Circle12X; ---- ctrlcntn.c.orig Thu Jul 9 23:29:00 1998 -+++ ctrlcntn.c Fri Jun 29 11:41:15 2007 -@@ -61,6 +61,9 @@ +--- ctrlcntn.c.orig 1998-07-09 16:29:00 UTC ++++ ctrlcntn.c +@@ -61,6 +61,9 @@ void init_connections () * Purpose: Open a connection to a remote process and update event handlers * Returns: -1 on failure, else IPC number */ @@ -1002,7 +1002,7 @@ int open_connection ( connection ) struct connectRec *connection; { -@@ -71,7 +74,6 @@ +@@ -71,7 +74,6 @@ int open_connection ( connection ) extern int ButtonSelectMask(), open_pipe(); extern int open_socket_listener(); extern struct connectRec *accept_socket_connection(); @@ -1010,9 +1010,9 @@ #endif #ifdef NOPIPEFLUSH ---- ctrlfile.c.orig Fri Apr 20 21:49:12 1990 -+++ ctrlfile.c Fri Jun 29 11:41:47 2007 -@@ -40,6 +40,9 @@ +--- ctrlfile.c.orig 1990-04-20 13:49:12 UTC ++++ ctrlfile.c +@@ -40,6 +40,9 @@ extern int errno; * Post state: Sets pointer to file, open and ready for writing * Returns: 2 = append, 1 = new file, 0 = user decided not to, -1 = error */ @@ -1022,7 +1022,7 @@ int open_output_file ( fd, edit, one_popup_row, prompt ) FILE **fd; EditStruct *edit; -@@ -56,7 +59,6 @@ +@@ -56,7 +59,6 @@ int open_output_file ( fd, edit, one_pop int get_edit_input(); EditStruct *init_edit_popup(); void clear_edit_buf(), unmap_popwin(); @@ -1030,7 +1030,7 @@ open_type[0] = 0; if( (get_edit_input(edit, one_popup_row, 1, 0, prompt) <= 0) || -@@ -137,6 +139,9 @@ +@@ -137,6 +139,9 @@ int open_output_file ( fd, edit, one_pop * Note: Sets pointer of file open and ready for reading * Returns: 1 on success, 0 if user decided not to, -1 on error */ @@ -1040,7 +1040,7 @@ int open_input_file ( fd, edit, one_popup_row, prompt ) FILE **fd; EditStruct *edit; -@@ -146,7 +151,6 @@ +@@ -146,7 +151,6 @@ int open_input_file ( fd, edit, one_popu char filename[132]; int exist; int get_edit_input(); @@ -1048,9 +1048,9 @@ if( get_edit_input(edit, one_popup_row, 1, 1, prompt) <= 0 ) return( 0 ); ---- ctrlgc.c.orig Wed May 2 16:19:55 1990 -+++ ctrlgc.c Fri Jun 29 11:42:09 2007 -@@ -237,10 +237,12 @@ +--- ctrlgc.c.orig 1990-05-02 08:19:55 UTC ++++ ctrlgc.c +@@ -237,10 +237,12 @@ GC set_edit_gc ( font, foreground, backg * Subroutine: get_fontstruct * Returns: Pointer to the specified fontstruct */ @@ -1064,7 +1064,7 @@ if( (app_font[app_code] == NULL) && (init_font(app_code) == NULL) ) return( NULL ); -@@ -253,11 +255,13 @@ +@@ -253,11 +255,13 @@ XFontStruct *get_fontstruct ( app_code ) * Purpose: Load the fonts used by this program * Returns: Font on success, else 0 */ @@ -1079,9 +1079,9 @@ for( i=0; ixbutton.button ) { case Button1: -@@ -58,10 +60,12 @@ +@@ -58,10 +60,12 @@ void get_cgraph_vertex ( event ) * event * Returns: 1 if a vertex was dropped, else 0 */ @@ -1201,7 +1201,7 @@ switch( event->xbutton.button ) { case Button1: -@@ -83,13 +87,15 @@ +@@ -83,13 +87,15 @@ int drop_cgraph_vertex ( event ) * Purpose: Handle grab vertex event for single color * Method: Grab old vertex or make new vertex - under mouse pointer */ @@ -1219,7 +1219,7 @@ /* clip against limits */ if( x < cgraph.graph.xzero ) -@@ -151,6 +157,9 @@ +@@ -151,6 +157,9 @@ static int grab_old_color_vertex ( x, y, * Subroutine: install_new_color_vertex * Purpose: Given hash position, install a new vertex, and make active */ @@ -1229,7 +1229,7 @@ static void install_new_color_vertex ( x, y, col ) int x, y; /* i: position of ULcorner of new hash mark */ struct colgRec *col; /* i: color info structure for one color */ -@@ -158,7 +167,6 @@ +@@ -158,7 +167,6 @@ static void install_new_color_vertex ( x double intensity, cell_level; int match; int select_best_hash_position(); @@ -1237,7 +1237,7 @@ col->active_hash = select_best_hash_position(x, y, col->hash, col->hash_cnt, &match, cgraph.vertical); -@@ -251,11 +259,13 @@ +@@ -251,11 +259,13 @@ static void add_color_vertex_hash ( col, * Purpose: Delete a color table vertex if one is under the mouse position * Returns: 1 if vertex was dropped, else 0 */ @@ -1252,9 +1252,9 @@ /* hash mark positions are upper left corner of hash box */ x -= HASH_RAY; ---- grphinit.c.orig Fri Apr 20 22:40:44 1990 -+++ grphinit.c Fri Jun 29 11:46:50 2007 -@@ -46,9 +46,11 @@ +--- grphinit.c.orig 1990-04-20 14:40:44 UTC ++++ grphinit.c +@@ -46,9 +46,11 @@ extern int XZ_efn; * Subroutine: init_colorbox * Purpose: Handle program init-time color bar and graph initialization */ @@ -1267,7 +1267,7 @@ cgraph.ncolors = color.ncolors; cgraph.red.table = &color.ctable.red; -@@ -68,10 +70,12 @@ +@@ -68,10 +70,12 @@ void init_colorbox ( ) * Purpose: Initialize color bar and related params * Xlib calls: XCreateSimpleWindow(), XMapSubwindows() */ @@ -1281,7 +1281,7 @@ colorbar.display = colorbox.display; colorbar.ref_width = colorbox.width; -@@ -92,10 +96,12 @@ +@@ -92,10 +96,12 @@ static void init_main_colorbar ( ) * Subroutine: adjust_main_colorbar * Purpose: Adjust color bar size params and/or color data if needed */ @@ -1295,7 +1295,7 @@ if( (colorbox.width != colorbar.ref_width) || (colorbox.height != colorbar.ref_height) ) { -@@ -113,11 +119,13 @@ +@@ -113,11 +119,13 @@ void adjust_main_colorbar ( ) * Purpose: Initialize color bar and related params * Xlib calls: XMapSubwindows() */ @@ -1310,7 +1310,7 @@ cgraph.bar.display = graphbox.display; cgraph.bar.ref_width = graphbox.width; -@@ -149,11 +157,13 @@ +@@ -149,11 +157,13 @@ void init_graph_colorbar ( ) * Subroutine: adjust_graph_colorbar * Purpose: Adjust color bar size params and/or color data if needed */ @@ -1325,9 +1325,9 @@ if( cgraph.vertical ) { if( graphbox.height != cgraph.bar.ref_height ) { ---- grphmove.c.orig Fri Apr 20 22:37:26 1990 -+++ grphmove.c Fri Jun 29 11:47:08 2007 -@@ -26,12 +26,14 @@ +--- grphmove.c.orig 1990-04-20 14:37:26 UTC ++++ grphmove.c +@@ -26,12 +26,14 @@ extern struct cgraphRec cgraph; * Purpose: Change values (and position) of designated vertices in * response to mouse movement */ @@ -1343,9 +1343,9 @@ /* clip against limits */ if( x < cgraph.graph.xzero ) ---- grpholap.c.orig Fri Apr 20 22:36:00 1990 -+++ grpholap.c Fri Jun 29 11:47:22 2007 -@@ -28,13 +28,15 @@ +--- grpholap.c.orig 1990-04-20 14:36:00 UTC ++++ grpholap.c +@@ -28,13 +28,15 @@ extern struct cgraphRec cgraph; * Subroutine: mark_colorline_overlap * Purpose: Make line representing more than one color black (or white) */ @@ -1362,9 +1362,9 @@ j = 0; if( cgraph.vertical ) { ---- grphtext.c.orig Fri Apr 20 22:39:37 1990 -+++ grphtext.c Fri Jun 29 11:49:42 2007 -@@ -33,6 +33,9 @@ +--- grphtext.c.orig 1990-04-20 14:39:37 UTC ++++ grphtext.c +@@ -33,6 +33,9 @@ extern struct cgraphRec cgraph; * Purpose: Set labeling pieces according to the graph window size * Xlib calls: XMoveWindow(), XResizeWindow(), XMapWindow() */ @@ -1374,7 +1374,7 @@ void init_color_graph_label ( ) { int new = 0; -@@ -40,7 +43,6 @@ +@@ -40,7 +43,6 @@ void init_color_graph_label ( ) int resize = 0; Window create_cgraph_box(); void init_color_graph_label(); @@ -1382,9 +1382,9 @@ if( cgraph.graphlabel.active == 0 ) return; ---- histdist.c.orig Wed Jul 29 01:56:45 1998 -+++ histdist.c Fri Jun 29 11:51:37 2007 -@@ -24,6 +24,9 @@ +--- histdist.c.orig 1998-07-28 18:56:45 UTC ++++ histdist.c +@@ -24,6 +24,9 @@ static char SccsId[] = "%W% %G%"; * Purpose: Distribute the levels among histogram sub-groups * Returns: number of groups with no assigned color levels */ @@ -1394,7 +1394,7 @@ int distribute_levels ( linklist, pixel_area, color_levels, pmin, pmax, ncolor ) SubrangeLink *linklist; -@@ -39,7 +42,6 @@ +@@ -39,7 +42,6 @@ int distribute_levels ( linklist, pixel_ #ifdef DEBUG int census = 0; #endif @@ -1402,9 +1402,9 @@ /* if all one group (no strong peaks), allocation is simple */ if( linklist->next == 0 ) { ---- histeql.c.orig Fri Apr 20 22:59:27 1990 -+++ histeql.c Fri Jun 29 11:51:55 2007 -@@ -24,6 +24,10 @@ +--- histeql.c.orig 1990-04-20 14:59:27 UTC ++++ histeql.c +@@ -24,6 +24,10 @@ static char SccsId[] = "%W% %G%"; * output level optimization accounts for large cell counts * for single levels (e.g. half of all pixels with value 0) */ @@ -1415,7 +1415,7 @@ void histogram_equalize ( scalemap, histogram, area, pmin, pmax, color_levels, pixels ) unsigned char *scalemap; /* i/o: scalemap (for signed indexing) */ -@@ -42,8 +46,6 @@ +@@ -42,8 +46,6 @@ void histogram_equalize ( scalemap, hist char *calloc_errchk(); int distribute_levels(); void generate_scalemap(), scan_histogram_for_peaks(), resolve_zeroes(); @@ -1424,9 +1424,9 @@ /* initialize link list */ linklist = (SubrangeLink *)calloc_errchk(10, sizeof(int), "HElink"); ---- histlist.c.orig Sat Jun 22 05:58:44 1991 -+++ histlist.c Fri Jun 29 11:52:24 2007 -@@ -29,6 +29,12 @@ +--- histlist.c.orig 1991-06-21 22:58:44 UTC ++++ histlist.c +@@ -29,6 +29,12 @@ static char SccsId[] = "%W% %G%"; * Subroutine: make_equalized_list * Purpose: Distributing levels for a subrange section of the histogram */ @@ -1439,7 +1439,7 @@ void make_equalized_list ( histogram, list, low_entry, high_entry, pixel_area, color_levels ) int *histogram; -@@ -47,10 +53,6 @@ +@@ -47,10 +53,6 @@ void make_equalized_list ( histogram, li int best_levels_under; int best_average_over = 0; /* average_area used to get best_levels */ int best_average_under = 0; @@ -1450,9 +1450,9 @@ /* else allocation distribution must first be determined */ /* run through histgram section making basic allocation and taking notes */ ---- histmap.c.orig Fri Apr 20 23:00:13 1990 -+++ histmap.c Fri Jun 29 11:53:06 2007 -@@ -28,6 +28,9 @@ +--- histmap.c.orig 1990-04-20 15:00:13 UTC ++++ histmap.c +@@ -28,6 +28,9 @@ static char SccsId[] = "%W% %G%"; * safely be applied. * Note: The original link-list of groups is freed. */ @@ -1462,7 +1462,7 @@ void generate_scalemap ( hist, subrange, scalemap, pixels ) int *hist; /* i: histogram (for signed offsets) */ SubrangeLink *subrange; /* i: linklist of subranges */ -@@ -36,7 +39,6 @@ +@@ -36,7 +39,6 @@ void generate_scalemap ( hist, subrange, { int baselevel; SubrangeLink *trash; @@ -1470,7 +1470,7 @@ baselevel = 0; while( subrange != 0 ) { -@@ -54,6 +56,9 @@ +@@ -54,6 +56,9 @@ void generate_scalemap ( hist, subrange, * Purpose: Make a section of scale map using histgroup link as guide * Called by: make_HE_scalemap() in HistEqual.c */ @@ -1480,7 +1480,7 @@ static void make_subrange_scalemap ( histogram, subrange, scalemap, baselevel, pixels ) int *histogram; -@@ -67,7 +72,6 @@ +@@ -67,7 +72,6 @@ static void unsigned char dispval; char *calloc_errchk(); void make_equalized_list(); @@ -1488,7 +1488,7 @@ /* if only one level, make map section */ if( subrange->color_levels <= 1 ) { -@@ -135,6 +139,10 @@ +@@ -135,6 +139,10 @@ static void list_to_map ( scalemap, hist * Purpose: Allocate levels for a histogram subrange. Special process * for situation when more levels than actually used values. */ @@ -1499,7 +1499,7 @@ static void make_gapped_list ( histogram, list, low, high, levels ) int *histogram; SubrangeList *list; -@@ -142,8 +150,6 @@ +@@ -142,8 +150,6 @@ static void make_gapped_list ( histogram { int range_j, max_range; int levels_used; @@ -1508,9 +1508,9 @@ levels_used = first_shortlist_pass(histogram, list, low, high, levels, ---- histscan.c.orig Fri Apr 20 23:00:36 1990 -+++ histscan.c Fri Jun 29 11:53:29 2007 -@@ -21,6 +21,10 @@ +--- histscan.c.orig 1990-04-20 15:00:36 UTC ++++ histscan.c +@@ -21,6 +21,10 @@ static char SccsId[] = "%W% %G%"; * Purpose: Scan the image histogram picking out large cell count values * make sub-groups of the histogram between the large count levels */ @@ -1521,7 +1521,7 @@ void scan_histogram_for_peaks ( subrange, histogram, pixel_area, map_levels, average ) SubrangeLink *subrange; /* i/o: link (initially covers range) */ -@@ -36,8 +40,6 @@ +@@ -36,8 +40,6 @@ void scan_histogram_for_peaks ( subrange int sr_nzentries; /* l: number of non-zero entries in subrange */ int sr_pixel_area; /* l: number of pixels in current subrange */ int sr_max_peak; /* l: highest peak within current subrange */ @@ -1530,9 +1530,9 @@ /* set initial pixel_count values */ sr_pixel_area = 0; ---- histzero.c.orig Fri Apr 20 23:01:03 1990 -+++ histzero.c Fri Jun 29 11:53:39 2007 -@@ -23,13 +23,15 @@ +--- histzero.c.orig 1990-04-20 15:01:03 UTC ++++ histzero.c +@@ -23,13 +23,15 @@ static char SccsId[] = "%W% %G%"; * Note: Adjoining groups are large count single level groups * Called by: histrogram_equalize() above */ @@ -1549,9 +1549,9 @@ /* if very first entry is a zero allocated link */ if( PriorLink->color_levels == 0 ) { ---- imgcheck.c.orig Tue Mar 13 03:31:30 2001 -+++ imgcheck.c Fri Jun 29 11:54:08 2007 -@@ -46,13 +46,15 @@ +--- imgcheck.c.orig 2001-03-12 21:31:30 UTC ++++ imgcheck.c +@@ -46,13 +46,15 @@ static char SccsId[] = "%W% %G%"; * Purpose: Do some consistency checks on image type and size * Returns: 0 if no errors found, else -1 */ @@ -1568,7 +1568,7 @@ extern int isfits(); ext = NULL; -@@ -148,6 +150,9 @@ +@@ -148,6 +150,9 @@ int check_image ( img, got_status ) * Purpose: Check array size vs file size etc * Returns: 0 if size determined and/or OK, else -1 */ @@ -1578,7 +1578,7 @@ static int check_array ( img ) struct imageRec *img; { -@@ -156,7 +161,6 @@ +@@ -156,7 +161,6 @@ static int check_array ( img ) float posdim; /* possible dimension */ int headersize; /* size in bytes of header */ int rawsize; @@ -1586,9 +1586,9 @@ /* get header size */ headersize = img->headersize; ---- imglogo.c.orig Fri Apr 27 00:31:48 1990 -+++ imglogo.c Fri Jun 29 11:54:27 2007 -@@ -372,13 +372,15 @@ +--- imglogo.c.orig 1990-04-26 16:31:48 UTC ++++ imglogo.c +@@ -372,13 +372,15 @@ static unsigned char logo[LOGO_SZ] = { * Subroutine: load_logo * Purpose: place logo image in image buffer */ @@ -1605,9 +1605,9 @@ /* fill buffer with background color */ bufpt = shortbuf; ---- imgnew.c.orig Thu Oct 15 06:01:58 1998 -+++ imgnew.c Fri Jun 29 11:54:42 2007 -@@ -52,6 +52,9 @@ +--- imgnew.c.orig 1998-10-14 23:01:58 UTC ++++ imgnew.c +@@ -52,6 +52,9 @@ extern struct windowRec desktop; * Purpose: Create all image coordinate parameters from the beginning * and take care of all that might be affected */ @@ -1617,7 +1617,7 @@ void new_display ( dispnow, clear, load, scale ) int dispnow; /* i: put-display-in-window-now flag */ int clear; /* i: clear img buf before reading flag */ -@@ -61,7 +64,6 @@ +@@ -61,7 +64,6 @@ void new_display ( dispnow, clear, load, void set_disptran(), new_pancursor(), new_scalemap(); void combine_transform(), set_edges(), set_dispoff(), set_magnifier(); void adjust_cursor_coords(), map_dispbox(), disp_dispbox(); @@ -1625,9 +1625,9 @@ /* Set disp to img and disp to file transforms */ set_disptran(&coord); ---- imgtrans.c.orig Fri Apr 20 23:13:46 1990 -+++ imgtrans.c Fri Jun 29 11:55:10 2007 -@@ -26,6 +26,9 @@ +--- imgtrans.c.orig 1990-04-20 15:13:46 UTC ++++ imgtrans.c +@@ -26,6 +26,9 @@ static char SccsId[] = "%W% %G%"; * 4-7 = flip y axis then rotate clockwise by (code - 4) * 90 degrees * Called by: load_image() in ImageRead.c */ @@ -1637,7 +1637,7 @@ void rotate_buf ( buf, flip, rotcode, width, height, buf_squared, buf_doubled ) short *buf; int flip; -@@ -36,7 +39,6 @@ +@@ -36,7 +39,6 @@ void rotate_buf ( buf, flip, rotcode, wi int maxdim; void xflip_buf(), yflip_buf(), zflip_buf(), cwturn_buf(), ccwturn_buf(); void transfer_buf(); @@ -1645,9 +1645,9 @@ if( flip ) rotcode += 4; ---- irafcrd.c.orig Fri Apr 20 23:16:02 1990 -+++ irafcrd.c Fri Jun 29 11:55:49 2007 -@@ -45,13 +45,15 @@ +--- irafcrd.c.orig 1990-04-20 15:16:02 UTC ++++ irafcrd.c +@@ -45,13 +45,15 @@ static char SccsId[] = "%W% %G%"; * If found and parsed, compute new transform for file coord. * Returns: 1 if subsection found and parsed successfully, else 0 */ @@ -1664,7 +1664,7 @@ void set_trans_speed(), combine_transform(), clear_coord_area(); if( parse_iraf_subsection(title, &xoff, &yoff, &block) == 0 ) { -@@ -92,6 +94,10 @@ +@@ -92,6 +94,10 @@ int guess_true_file_coords ( title ) * Purpose: Parse for subsection and blocking from the image name * Returns: 1 if subsection or blocking was used, else 0 */ @@ -1675,7 +1675,7 @@ static int parse_iraf_subsection ( s, xoff, yoff, block ) char *s; /* i: file name */ int *xoff; /* o: x offset */ -@@ -99,8 +105,6 @@ +@@ -99,8 +105,6 @@ static int parse_iraf_subsection ( s, xo int *block; /* o: block */ { char *t, *u; /* temp char pointers */ @@ -1684,7 +1684,7 @@ /* seed the default values */ *xoff = 1; -@@ -139,6 +143,9 @@ +@@ -139,6 +143,9 @@ static int parse_iraf_subsection ( s, xo * Subroutine: get_subsection_offsets * Purpose: parse subsection syntax for x and y offsets of subsection */ @@ -1694,7 +1694,7 @@ static void get_subsection_offsets ( s, xoff, yoff, is_qp ) char *s; int *xoff, *yoff; -@@ -147,7 +154,6 @@ +@@ -147,7 +154,6 @@ static void get_subsection_offsets ( s, int x1, x2; int y1, y2; char *sy, *s2, *st; @@ -1702,9 +1702,9 @@ /* if not qp, grab the initial x offset right after the '[' */ sy = fn_substr(s, ","); ---- irafimtl.c.orig Thu Feb 26 01:52:37 1998 -+++ irafimtl.c Fri Jun 29 11:56:14 2007 -@@ -46,6 +46,9 @@ +--- irafimtl.c.orig 1998-02-25 19:52:37 UTC ++++ irafimtl.c +@@ -46,6 +46,9 @@ static char wcsbuf[SZ_WCSBUF]; * Subroutine: imtool_response * Purpose: Read imtool messages from iraf (return 1 if pipe trouble) */ @@ -1714,7 +1714,7 @@ void imtool_response ( port, imhead, ndatabytes ) struct connectRec *port; /* i: struct of port for IRAF input */ struct imtoolRec *imhead; /* i: packet header, already read in */ -@@ -60,7 +63,6 @@ +@@ -60,7 +63,6 @@ void imtool_response ( port, imhead, nda void set_curpos_to_iraf_trigger(), set_cursor_from_iraf(), imtool_output(); void set_imtool_scale(), set_cursor_to_iraf(), disp_subpiece(); void map_panbox(), disp_panbox(), send_curpos_to_iraf(), flush_connection(); @@ -1722,7 +1722,7 @@ switch( imhead->subunit & 077 ) { case FEEDBACK: -@@ -189,6 +191,9 @@ +@@ -189,6 +191,9 @@ void imtool_response ( port, imhead, nda * Purpose: Reset buffer sizes, coordinate systems and parameters as * needed. */ @@ -1732,7 +1732,7 @@ void imtool_newimage ( is_wcs, imhead ) int is_wcs; struct imtoolRec *imhead; -@@ -199,7 +204,6 @@ +@@ -199,7 +204,6 @@ void imtool_newimage ( is_wcs, imhead ) void set_disptran(), combine_transform(), set_edges(), set_dispoff(); void adjust_cursor_coords(), set_magnifier(), disp_subpiece(), set_tdisp(); void set_imtool_scale(), imtool_reinit(), new_pancursor(); @@ -1740,9 +1740,9 @@ /* set size and frame */ if( is_wcs ) ---- irafio.c.orig Tue Oct 13 00:17:50 1992 -+++ irafio.c Fri Jun 29 11:56:48 2007 -@@ -102,6 +102,9 @@ +--- irafio.c.orig 1992-10-12 17:17:50 UTC ++++ irafio.c +@@ -102,6 +102,9 @@ void rename_imtool_connection ( name, in * Subroutine: imtool_output * Purpose: Write image data back to iraf device channel */ @@ -1752,7 +1752,7 @@ void imtool_output ( imhead, odev, imagebuf, width, height ) struct imtoolRec *imhead; struct connectRec *odev; -@@ -116,7 +119,6 @@ +@@ -116,7 +119,6 @@ void imtool_output ( imhead, odev, image int buferr = 0; char fifobuf[SZ_FIFOBUF + 4]; int write_connection(); @@ -1760,7 +1760,7 @@ ndatabytes = -(int)imhead->thingct; x = imhead->x & 077777; -@@ -153,6 +155,9 @@ +@@ -153,6 +155,9 @@ void imtool_output ( imhead, odev, image * Called by: imtool_response() in RemoteImtool.c * Returns: -1 if read no bytes, 1 if trouble, else 0 */ @@ -1770,7 +1770,7 @@ int imtool_input ( imhead, idev, readbuf, iwdth, owdth, y1, y2, imagebuf, imbufsz ) struct imtoolRec *imhead; -@@ -171,7 +176,6 @@ +@@ -171,7 +176,6 @@ int imtool_input ( imhead, idev, readbuf int got, try, gotten; short *obuf; int read_connection(); @@ -1778,9 +1778,9 @@ /* get data count and packing type */ ndatavals = -(int)imhead->thingct; ---- irafpipe.c.orig Thu Feb 26 01:52:26 1998 -+++ irafpipe.c Fri Jun 29 11:57:01 2007 -@@ -33,6 +33,9 @@ +--- irafpipe.c.orig 1998-02-25 19:52:26 UTC ++++ irafpipe.c +@@ -33,6 +33,9 @@ static char SccsId[] = "%W% %G%"; * Subroutine: read_imtool_packet() * Purpose: event handler for packet input from iraf */ @@ -1790,7 +1790,7 @@ void read_imtool_packet( port ) struct connectRec *port; { -@@ -48,7 +51,6 @@ +@@ -48,7 +51,6 @@ void read_imtool_packet( port ) #endif int read_connection(); void imtool_response(), swap_bytes(); @@ -1798,9 +1798,9 @@ /* read the header */ bytes = read_connection(port, (char *)&imhead, sizeof(struct imtoolRec)); ---- maininit.c.orig Tue Dec 2 05:21:35 2003 -+++ maininit.c Fri Jun 29 11:57:26 2007 -@@ -76,11 +76,13 @@ +--- maininit.c.orig 2003-12-01 23:21:35 UTC ++++ maininit.c +@@ -76,11 +76,13 @@ Display *display; /* display connection * Xlib calls: XSetErrorHandler() * UNIX calls: setrlimit() */ @@ -1815,7 +1815,7 @@ void crash_on_error(), control_event_loop(); void say_goodbye(); -@@ -141,13 +143,15 @@ +@@ -141,13 +143,15 @@ void say_goodbye ( code ) * Purpose: Initialize parameters in the records * Note: Resource or default file not yet used */ @@ -1832,9 +1832,9 @@ int parse_cmdline(), check_image(); void say_goodbye(), init_connections(); ---- mainkey.c.orig Thu Sep 25 05:38:25 2003 -+++ mainkey.c Fri Jun 29 11:58:47 2007 -@@ -87,6 +87,9 @@ +--- mainkey.c.orig 2003-09-24 22:38:25 UTC ++++ mainkey.c +@@ -87,6 +87,9 @@ static double oldypix = 0.0; static double oldxpos, oldypos; @@ -1844,7 +1844,7 @@ void key_response() { -@@ -110,7 +113,6 @@ +@@ -110,7 +113,6 @@ key_response() void print_center(), print_cursor(); void move_pointer(); void get_cursor_pos(); @@ -1852,9 +1852,9 @@ void toggle_region_visibility(), toggle_region_labeling(); double xbuf, ybuf, xfile, yfile; double newxpos, newypos, distance; ---- mgfyctrl.c.orig Fri May 7 02:47:12 1999 -+++ mgfyctrl.c Fri Jun 29 11:59:53 2007 -@@ -45,12 +45,14 @@ +--- mgfyctrl.c.orig 1999-05-06 19:47:12 UTC ++++ mgfyctrl.c +@@ -45,12 +45,14 @@ extern struct magRec magset; * Purpose: Magnify location of a dispbox event * Xlib calls: XCheckWindowEvent(), XSync() */ @@ -1870,7 +1870,7 @@ /* get only the most recent mouse moved event */ XSync(dispbox.display, 0); -@@ -132,6 +134,9 @@ +@@ -132,6 +134,9 @@ void redraw_magnifier ( ) * Purpose: Show pointer coordinates and image value in display window * Xlib calls: XDrawImageString() */ @@ -1880,7 +1880,7 @@ static void label_file_coords ( bufX, bufY ) double bufX, bufY; { -@@ -142,7 +147,6 @@ +@@ -142,7 +147,6 @@ static void label_file_coords ( bufX, bu float fileX, fileY; GC gc, set_edit_gc(); void d_transform(); @@ -1888,7 +1888,7 @@ static int lwcs0 = 0; static int lpix0 = 0; int i; -@@ -289,6 +293,9 @@ +@@ -289,6 +293,9 @@ void clear_coord_area () * but has not been refined for the val section. * Xlib call: XDrawImageString() */ @@ -1898,7 +1898,7 @@ static void label_file_coords_proportional ( bufX, bufY ) double bufX, bufY; { -@@ -297,7 +304,6 @@ +@@ -297,7 +304,6 @@ static void label_file_coords_proportion float fileX, fileY; GC gc, set_edit_gc(); void d_transform(); @@ -1906,9 +1906,9 @@ gc = set_edit_gc(magset.text.font, magset.text.foreground, magset.text.background); ---- mgfytabl.c.orig Thu Jul 9 23:28:28 1998 -+++ mgfytabl.c Fri Jun 29 12:00:33 2007 -@@ -30,6 +30,10 @@ +--- mgfytabl.c.orig 1998-07-09 16:28:28 UTC ++++ mgfytabl.c +@@ -30,6 +30,10 @@ static char SccsId[] = "%W% %G%"; * coordinates * Note: Uses event coords in control struct (control.event.xkey) */ @@ -1919,7 +1919,7 @@ void print_table () { int bufx, bufy; -@@ -39,8 +43,6 @@ +@@ -39,8 +43,6 @@ void print_table () int table_size; int col_width; int rot; @@ -1928,9 +1928,9 @@ /* determine the buffer coordinates of the event */ if( get_key_buf_coords(&control.event.xkey, &bufx, &bufy) == 0 ) { ---- pancrsr.c.orig Wed May 2 14:49:17 1990 -+++ pancrsr.c Fri Jun 29 12:01:31 2007 -@@ -45,13 +45,15 @@ +--- pancrsr.c.orig 1990-05-02 06:49:17 UTC ++++ pancrsr.c +@@ -45,13 +45,15 @@ void draw_pancursor ( ) * Subroutine: new_pancursor * Purpose: Create and draw panbox cursor given image coordinates */ @@ -1947,9 +1947,9 @@ if( pancur_present ) { /* erase the old box if it was visible */ ---- panimage.c.orig Sat Apr 21 00:17:38 1990 -+++ panimage.c Fri Jun 29 12:01:53 2007 -@@ -45,12 +45,14 @@ +--- panimage.c.orig 1990-04-20 16:17:38 UTC ++++ panimage.c +@@ -45,12 +45,14 @@ void disp_panbox ( ) * Subroutine: map_panbox * Purpose: Fill the panbox display buffer, mapping from its short buffer */ @@ -1968,9 +1968,9 @@ void panimage_halftone(); if( color.ncolors <= 1 ) { ---- prntcent.c.orig Sat Aug 21 05:18:40 1999 -+++ prntcent.c Fri Jun 29 12:41:46 2007 -@@ -36,6 +36,11 @@ +--- prntcent.c.orig 1999-08-20 22:18:40 UTC ++++ prntcent.c +@@ -36,6 +36,11 @@ static char SccsId[] = "%W% %G%"; * Returns 1 if successful, else 0 * Note: Uses event coords in control struct (control.event.xkey) */ @@ -1982,7 +1982,7 @@ void print_center ( xc, yc ) -@@ -59,9 +64,6 @@ +@@ -59,9 +64,6 @@ double *xc, *yc; /* Returned centroided int xfile, yfile; char string[64]; int lstr = 48; @@ -1992,9 +1992,9 @@ void d_trans(); int iswcs(); ---- prntcurs.c.orig Thu Jan 17 04:54:18 2002 -+++ prntcurs.c Fri Jun 29 12:41:28 2007 -@@ -31,12 +31,14 @@ +--- prntcurs.c.orig 2002-01-16 22:54:18 UTC ++++ prntcurs.c +@@ -31,12 +31,14 @@ static char SccsId[] = "%W% %G%"; * Subroutine: print_cursor * Purpose: print location of a dispbox event */ @@ -2010,9 +2010,9 @@ (void)get_cursor_pos (event, &bufx, &bufy, &filex, &filey ); (void)print_file_value ( bufx, bufy, filex, filey ); ---- readarr.c.orig Tue Feb 23 20:05:41 1999 -+++ readarr.c Fri Jun 29 12:02:06 2007 -@@ -28,6 +28,9 @@ +--- readarr.c.orig 1999-02-23 14:05:41 UTC ++++ readarr.c +@@ -28,6 +28,9 @@ static char SccsId[] = "%W% %G%"; * Purpose: Read array data from a file * Note: Assumes file was tested benignly, exits here if trouble */ @@ -2022,7 +2022,7 @@ void read_array ( fd, img, imgbuf, filebuf, width, height, X, Y, block, verbose ) int fd; /* if >=0 handle to open & ready image file */ -@@ -40,7 +43,6 @@ +@@ -40,7 +43,6 @@ void read_array ( fd, img, imgbuf, fileb int verbose; /* whether to print explanatory messages */ { int vals; @@ -2030,9 +2030,9 @@ int image_start; int open_disk(), lseek_disk(); void close_disk(); ---- readfith.c.orig Tue Sep 29 22:40:06 1998 -+++ readfith.c Fri Jun 29 12:02:34 2007 -@@ -46,6 +46,9 @@ +--- readfith.c.orig 1998-09-29 15:40:06 UTC ++++ readfith.c +@@ -46,6 +46,9 @@ static char SccsId[] = "%W% %G%"; * Purpose: Find important FITS parameters in FITS header * Returns: 1 if success, else 0 */ @@ -2042,7 +2042,7 @@ int read_fitsheader ( header, length, bitpix, naxis, naxes, scale, bias ) char *header; int length; -@@ -55,7 +58,6 @@ +@@ -55,7 +58,6 @@ int read_fitsheader ( header, length, bi float *scale; float *bias; { @@ -2050,7 +2050,7 @@ struct WorldCoor *wcsinit(); char *header0; header0 = header; -@@ -144,6 +146,9 @@ +@@ -144,6 +146,9 @@ static int get_keyint ( header, keyword, * Purpose: Return the float value in the data field for a given FITS * header keyword. If key not found, return 0. */ @@ -2060,7 +2060,7 @@ static int get_keyfloat ( header, keyword, length, val, report_error) char *header; /* buffer start */ char *keyword; /* keyword to match */ -@@ -153,7 +158,6 @@ +@@ -153,7 +158,6 @@ static int get_keyfloat ( header, keywor { int key_not_end; int i; @@ -2068,9 +2068,9 @@ void no_fitscomment(); key_not_end = (strncmp(keyword, "END ", 8) != 0); ---- rgnanli.c.orig Sat Apr 21 00:25:03 1990 -+++ rgnanli.c Fri Jun 29 12:02:53 2007 -@@ -89,14 +89,16 @@ +--- rgnanli.c.orig 1990-04-20 16:25:03 UTC ++++ rgnanli.c +@@ -89,14 +89,16 @@ void new_annulus_edge ( cursor ) * Note: "vala valb valc ..." and "val1 val2 n=int" are both * permitted syntax forms */ @@ -2089,9 +2089,9 @@ char *next_token(); i = 0; ---- rgndraw.c.orig Tue Dec 1 03:46:40 1998 -+++ rgndraw.c Fri Jun 29 12:04:06 2007 -@@ -115,12 +115,14 @@ +--- rgndraw.c.orig 1998-11-30 21:46:40 UTC ++++ rgndraw.c +@@ -115,12 +115,14 @@ void disp_regions ( cursor ) * Subroutine: disp_region * Purpose: Draw one saved cursor region and its labels */ @@ -2108,7 +2108,7 @@ if( rgdraw.visible && (region != NULL) ) { gc = set_region_gc(region); -@@ -215,11 +217,13 @@ +@@ -215,11 +217,13 @@ static void draw_region_label ( string, * Purpose: Draw one saved cursor region outline or point index * Note: gc is already set, hence NULL GCspec in draw calls */ @@ -2123,7 +2123,7 @@ void draw_annuli(), draw_cursor(); if( region->type != COP_Point ) { -@@ -246,12 +250,14 @@ +@@ -246,12 +250,14 @@ static void draw_region ( region, gc ) /* * Subroutine: label_annuli */ @@ -2139,7 +2139,7 @@ /* apply label to outer annulus */ annulus = region; -@@ -268,6 +274,10 @@ +@@ -268,6 +274,10 @@ static void label_annuli ( region, gc ) * Purpose: Draw one region's label line and text for center and edge * Xlib calls: XDrawLine() */ @@ -2150,7 +2150,7 @@ static void label_region ( region, gc ) struct cursorRec *region; GC gc; -@@ -277,8 +287,6 @@ +@@ -277,8 +287,6 @@ static void label_region ( region, gc ) char edge_string[132]; int len; int exclude; @@ -2159,9 +2159,9 @@ /* if label not requested or don't know how to label or will another part */ if( (!rgdraw.label) || (region->type == COP_Polygon) ) ---- rgndrop.c.orig Sat Apr 21 00:31:38 1990 -+++ rgndrop.c Fri Jun 29 12:04:34 2007 -@@ -64,14 +64,16 @@ +--- rgndrop.c.orig 1990-04-20 16:31:38 UTC ++++ rgndrop.c +@@ -64,14 +64,16 @@ void unsave_region ( cursor, dead_meat ) * cursors enclose one or two digit label but have 0 area). * In case of equal areas (i.e. points), closer center is used. */ @@ -2180,7 +2180,7 @@ chosen = NULL; region = cursor->next_region; -@@ -115,13 +117,15 @@ +@@ -115,13 +117,15 @@ static int closer_to_center ( challenger * Subroutine: is_inside_region * Purpose: Determine if mouse is within a region */ @@ -2197,9 +2197,9 @@ if( region->type == COP_Polygon ) return( pointer_is_inside_polygon((double)x, (double)y, ---- rgnwpros.c.orig Wed Jan 9 10:57:30 1991 -+++ rgnwpros.c Fri Jun 29 12:29:12 2007 -@@ -45,11 +45,13 @@ +--- rgnwpros.c.orig 1991-01-09 03:57:30 UTC ++++ rgnwpros.c +@@ -45,11 +45,13 @@ static char SccsId[] = "%W% %G%"; * Purpose: Write ROSAT PROS style region description to file * Method: Recurse first to start writing from end of link list */ @@ -2214,7 +2214,7 @@ /* Check for pointer before doing anything */ if( region == NULL ) -@@ -84,13 +86,15 @@ +@@ -84,13 +86,15 @@ void write_region_pros ( fd, region ) /* Subroutine: cat_shape * Purpose: Put simple PROS description of given cursor in line buffer */ @@ -2231,7 +2231,7 @@ switch( region->type ) { case COP_Box: -@@ -205,12 +209,14 @@ +@@ -205,12 +209,14 @@ static void cat_cen ( region, line ) * Subroutine: cat_polypts * Purpose: Add list of point coordinates to line buffer (for polygon) */ @@ -2247,7 +2247,7 @@ cat_pt((double)region->poly[0].fileX, (double)region->poly[0].fileY, line, 0); -@@ -254,12 +260,14 @@ +@@ -254,12 +260,14 @@ static void cat_pt ( x, y, line, comma ) * Purpose: Put a PROS style description of circular annuli on the * line buffer */ @@ -2263,7 +2263,7 @@ (void)strcat(line, "ANNULUS("); cat_cen(region, line); -@@ -275,14 +283,16 @@ +@@ -275,14 +283,16 @@ static void cat_annulus ( region, line ) * Subroutine: write_annuli * Purpose: Write PROS type description to produce annuli of given shapes */ @@ -2282,7 +2282,7 @@ /* annuli start with next_annulus (base region is not one of them) */ if( (annulus = region->next_annulus) != NULL ) { -@@ -309,11 +319,13 @@ +@@ -309,11 +319,13 @@ static void write_annuli ( region, line, * Purpose: Add outer shape anded with not of inner shape to make * an annular ring */ @@ -2297,9 +2297,9 @@ if( region->next_annulus != NULL ) { if( region->exclude_region ) ---- rgnwrite.c.orig Fri Jun 29 12:42:50 2007 -+++ rgnwrite.c Fri Jun 29 12:29:47 2007 -@@ -58,6 +58,9 @@ +--- rgnwrite.c.orig 1995-09-08 22:29:19 UTC ++++ rgnwrite.c +@@ -58,6 +58,9 @@ EditStruct *region_edit; * Subroutine: write_regions * Purpose: Write region info to a file */ @@ -2309,7 +2309,7 @@ void write_regions ( cursor, image, output_type ) struct cursorRec *cursor; struct imageRec *image; -@@ -66,7 +69,6 @@ +@@ -66,7 +69,6 @@ void write_regions ( cursor, image, outp FILE *fd; static int last_output_type = 0; char fname[SZ_FNAME]; @@ -2317,7 +2317,7 @@ int open_output_file(); EditStruct *init_edit_popup(); void set_path_iraf(), write_region_pros(), load_edit_struct(), timestamp(); -@@ -146,13 +148,15 @@ +@@ -146,13 +148,15 @@ static void write_region_imtool ( fd, re * Subroutine: timestamp * Purpose: Write date and filename (if known) to region file */ @@ -2334,9 +2334,9 @@ /* timestamp the first entry in the output file. */ set_time_string (line); ---- sclctrl.c.orig Thu Oct 10 22:55:57 1996 -+++ sclctrl.c Fri Jun 29 12:30:24 2007 -@@ -70,6 +70,9 @@ +--- sclctrl.c.orig 1996-10-10 15:55:57 UTC ++++ sclctrl.c +@@ -70,6 +70,9 @@ void select_scalemap () * Subroutine: new_scalemap * Purpose: Scalemap calculation for a new image */ @@ -2346,7 +2346,7 @@ void new_scalemap ( ) { static double cmdMin = 0.0; -@@ -78,7 +81,6 @@ +@@ -78,7 +81,6 @@ void new_scalemap ( ) static int max_given = 0; static int imtool_200 = 0; static int init = 1; /* identify first time called */ @@ -2354,9 +2354,9 @@ void make_scalemap(), color_logo(); #ifdef IMTOOL void set_imtool_colors(); ---- sclmap.c.orig Tue Oct 25 21:25:02 1994 -+++ sclmap.c Fri Jun 29 12:30:47 2007 -@@ -36,11 +36,13 @@ +--- sclmap.c.orig 1994-10-25 15:25:02 UTC ++++ sclmap.c +@@ -36,11 +36,13 @@ static char SccsId[] = "%W% %G%"; * Note: Map goes from image value to hardware value (through ideal * map value using pixels array from XAllocColors) */ @@ -2371,7 +2371,7 @@ /* note the range of data for which mapping is to be calculated */ if( image_max == image_min ) -@@ -105,6 +107,9 @@ +@@ -105,6 +107,9 @@ void make_scalemap ( image_min, image_ma * Subroutine: linear_scale * Purpose: Distribute color levels in the map evenly */ @@ -2381,7 +2381,7 @@ static void linear_scale ( image_min, image_max ) int image_min, image_max; /* i: limits of values in display */ { -@@ -118,7 +123,6 @@ +@@ -118,7 +123,6 @@ static void linear_scale ( image_min, im register int imageval; register int pixval; register int imagelim; @@ -2389,9 +2389,9 @@ range_min = image_min; range_max = image_max; ---- wndwconf.c.orig Sat Jan 21 06:27:13 1995 -+++ wndwconf.c Fri Jun 29 12:40:29 2007 -@@ -55,9 +55,11 @@ +--- wndwconf.c.orig 1995-01-21 00:27:13 UTC ++++ wndwconf.c +@@ -55,9 +55,11 @@ static unsigned int geo_width, geo_heigh * Method: The size can be given or set to norm. If given but less * than min (i.e. 0,0) it becomes the minimum configuration. */ @@ -2404,9 +2404,9 @@ desktop.hints.min_width = (2 * desktop.xzero) + (2 * dispbox.bdrwidth) + dispbox.hints.min_width; ---- wndwinit.c.orig Sat Dec 15 05:19:23 2001 -+++ wndwinit.c Fri Jun 29 12:41:01 2007 -@@ -53,11 +53,13 @@ +--- wndwinit.c.orig 2001-12-14 23:19:23 UTC ++++ wndwinit.c +@@ -53,11 +53,13 @@ static char **cmd_argv; /* i: command l * Uses: create_window() in WndwCreate.c * Xlib calls: DisplayWidth(), DisplayHeight(); */ @@ -2421,7 +2421,7 @@ void init_desktop(), create_window(); /* set display screen parameters for all to see */ -@@ -81,9 +83,11 @@ +@@ -81,9 +83,11 @@ void init_windows1 ( argc, argv ) * Uses: configure_windows() in WndwConfig.c * Uses: get_window_dimensions(), create_window() in WndwCreate.c */ @@ -2434,7 +2434,7 @@ void get_window_dimensions(), configure_windowgroup(), create_window(); /* install runtime environment parameters for all windows */ -@@ -175,11 +179,13 @@ +@@ -175,11 +179,13 @@ void raise_windows ( ) * Subroutine: init_window_basics, set_window_basics * Purpose: Set the runtime environment parameters */ @@ -2449,9 +2449,9 @@ ximage = XCreateImage(desktop.display, color.visual, color.screen_depth, dispbox.image.format, 0, malloc(4), 2, 2, ---- wndwmaus.c.orig Thu Dec 20 04:06:46 2001 -+++ wndwmaus.c Fri Jun 29 12:41:12 2007 -@@ -61,11 +61,13 @@ +--- wndwmaus.c.orig 2001-12-19 22:06:46 UTC ++++ wndwmaus.c +@@ -61,11 +61,13 @@ static Cursor keycursor; * Subroutine: init_mousepointers * Purpose: Set up the various mouse pointer icons for all windows */ diff --git a/astro/saoimage/files/patch-makefile.FreeBSD b/astro/saoimage/files/patch-makefile.FreeBSD index d897bf4e5ea1..b9c3ad9da248 100644 --- a/astro/saoimage/files/patch-makefile.FreeBSD +++ b/astro/saoimage/files/patch-makefile.FreeBSD @@ -1,5 +1,5 @@ ---- makefile.FreeBSD.orig Thu Sep 20 06:27:49 2001 -+++ makefile.FreeBSD Wed Jul 24 01:12:35 2002 +--- makefile.FreeBSD.orig 2003-04-01 17:34:57 UTC ++++ makefile.FreeBSD @@ -36,9 +36,9 @@ # FBCONFIG_2, which is set to the value of IMTOOLRC in the definition of # the CFLAGS macro below.) @@ -13,7 +13,7 @@ IMTOOLRC = $(IMTRCDIR)imtoolrc FIFO_I = $(ROOT)/dev/imt1i -@@ -46,7 +46,7 @@ +@@ -46,7 +46,7 @@ FIFO_O = $(ROOT)/dev/imt1o FIFO_LN = $(ROOT)/dev/imt1 # Compiler specification. @@ -22,7 +22,7 @@ # Uncomment these two lines to compile with gcc (add any optimizers you wish). #CC = gcc -finline-functions -fdelayed-branch -fstrength-reduce # Delayed branches could win big on RISC: many inner loops have branches -@@ -76,12 +76,12 @@ +@@ -76,12 +76,12 @@ MFLAGS = -DLSB -DSUN -DPSCRIPT -DQUIT # OFLAGS: compiler optimization/debug options. #OFLAGS = -g -DDEBUG @@ -37,7 +37,7 @@ # Libraries that move about or may require special specification. # -@@ -89,7 +89,7 @@ +@@ -89,7 +89,7 @@ ADFLAGS = -I/usr/X11R6/include # usual link search path, i.e., it is not in /usr/lib, it may be necessary # to specify its path fully in XLIB. @@ -46,7 +46,7 @@ #XLIB = -L/usr/X11R6/lib -lX11 # ATTENTION: OpenWindows users... #F77LIB = -lF77 -lI77 -lU77 F77LIB = -lf2c -@@ -307,7 +307,7 @@ +@@ -307,7 +307,7 @@ tape: $(MAKE) ARCFILE=$(TAPEDEV) tar @@ -55,7 +55,7 @@ STRUCT = hfiles/struct.h hfiles/buffer.h hfiles/color.h hfiles/control.h \ hfiles/coord.h hfiles/cursor.h hfiles/image.h hfiles/window.h WORKS = $(XLIBH) $(STRUCT) hfiles/constant.h hfiles/extern.h $(WCSH) -@@ -419,8 +419,8 @@ +@@ -419,8 +419,8 @@ maininit.o : $(XLIBH) $(STRUCT) hfiles/c defs/dispbox.def defs/magnibox.def defs/panbox.def \ defs/btnbox.def defs/colorbox.def defs/graphbox.def \ defs/desktop.def defs/cursor.def diff --git a/astro/saoimage/files/patch-rgnwrite.c b/astro/saoimage/files/patch-rgnwrite.c index 6ea9d650d091..7ec00f613021 100644 --- a/astro/saoimage/files/patch-rgnwrite.c +++ b/astro/saoimage/files/patch-rgnwrite.c @@ -1,6 +1,6 @@ ---- rgnwrite.c.orig Sun Jan 16 23:54:54 2000 -+++ rgnwrite.c Sun Jan 16 23:55:51 2000 -@@ -183,7 +183,7 @@ +--- rgnwrite.c.orig 1995-09-08 22:29:19 UTC ++++ rgnwrite.c +@@ -183,7 +183,7 @@ static void set_time_string ( time_strin #ifdef LONG64 int time(); #else diff --git a/astro/stars/files/patch-main.c b/astro/stars/files/patch-main.c index 96b2fb126efc..104f04f04bac 100644 --- a/astro/stars/files/patch-main.c +++ b/astro/stars/files/patch-main.c @@ -1,6 +1,6 @@ ---- main.c.orig 1996-04-10 12:58:49.000000000 +0200 -+++ main.c 2011-12-20 20:04:16.146176426 +0100 -@@ -48,7 +48,7 @@ +--- main.c.orig 1996-04-10 10:58:49 UTC ++++ main.c +@@ -48,7 +48,7 @@ void setup(); void events(); void shutdn(); @@ -9,7 +9,7 @@ { setup(); events(); -@@ -241,37 +241,37 @@ +@@ -241,37 +241,37 @@ void events() XQueryKeymap(xgh.display, keys); diff --git a/astro/sunclock/files/patch-readpng.c b/astro/sunclock/files/patch-readpng.c index 1481473bc696..9b3ce86736c2 100644 --- a/astro/sunclock/files/patch-readpng.c +++ b/astro/sunclock/files/patch-readpng.c @@ -1,6 +1,6 @@ ---- readpng.c.orig 2005-10-23 21:36:29.000000000 +0200 -+++ readpng.c 2010-03-29 14:14:22.000000000 +0200 -@@ -57,7 +57,7 @@ +--- readpng.c.orig 2005-10-23 19:36:29 UTC ++++ readpng.c +@@ -57,7 +57,7 @@ TestPNG(char *file) /* gets called a LO fread(header, 1, 8, fp); fclose(fp); diff --git a/astro/sunclock/files/patch-sunclock.c b/astro/sunclock/files/patch-sunclock.c index c3e9135f0983..c103f3cea252 100644 --- a/astro/sunclock/files/patch-sunclock.c +++ b/astro/sunclock/files/patch-sunclock.c @@ -1,4 +1,4 @@ ---- sunclock.c +--- sunclock.c.orig 2008-08-07 12:40:24 UTC +++ sunclock.c @@ -113,7 +113,6 @@ #include @@ -16,7 +16,7 @@ #ifdef NEW_CTIME extern char * timezone(); #endif -@@ -2197,8 +2195,8 @@ +@@ -2197,8 +2195,8 @@ struct Sundata * Context; if (!Context->mark1.city) return; @@ -27,7 +27,7 @@ /* Get local time at given location */ setTZ(Context->mark1.city); -@@ -2335,20 +2333,11 @@ +@@ -2335,20 +2333,11 @@ struct Sundata * Context; char s[128]; char slat[20], slon[20], slatp[20], slonp[20]; double dist; @@ -50,7 +50,7 @@ if (!Context->wintype) { char num[80]; -@@ -2696,7 +2685,7 @@ +@@ -2696,7 +2685,7 @@ int build; Context->bits = 0; Context->flags.update = 4; @@ -59,7 +59,7 @@ Context->projtime = -1L; Context->roottime = -1L; Context->animtime = -1L; -@@ -3918,7 +3907,7 @@ +@@ -3918,7 +3907,7 @@ struct Sundata * Context; if (button_pressed) return; @@ -68,7 +68,7 @@ erase_obj = 1; if (Context->flags.colorlevel == MONOCHROME || -@@ -3926,10 +3915,10 @@ +@@ -3926,10 +3915,10 @@ struct Sundata * Context; drawSunAndMoon(Context); erase_obj = 0; @@ -81,7 +81,7 @@ &Context->moondec, &Context->moonlon, &junk, &junk, &junk, &junk, &junk, &junk ); Context->moonlon = fixangle(Context->moonlon+180.0) - 180.0; -@@ -3946,10 +3935,10 @@ +@@ -3946,10 +3935,10 @@ struct Sundata * Context; update the illuminated area on the screen. */ if (Context->projtime < 0 || @@ -94,7 +94,7 @@ Context->noon = noon; Context->fnoon = fnoon; moveNightArea(Context); -@@ -4557,8 +4546,8 @@ +@@ -4557,8 +4546,8 @@ int dy[5] = { 0, 1, -1, 0, 0}; hw = Context->geom.height; if (do_root == 2) hw += Context->hstrip; @@ -105,7 +105,7 @@ else if (do_root == 2 && mode==0 && rootpix) update = 0; -@@ -4569,7 +4558,7 @@ +@@ -4569,7 +4558,7 @@ int dy[5] = { 0, 1, -1, 0, 0}; XSetForeground(dpy, Context->gdata->wingc, Context->gdata->pixel[ROOTCOLOR]); XFillRectangle(dpy, rootpix, Context->gdata->wingc, 0, 0, wr, hr); @@ -114,7 +114,7 @@ if (random_rootpos) { rootdx = (double)(random() % 10001)/10000.0; rootdy = (double)(random() % 10001)/10000.0; -@@ -5542,7 +5531,7 @@ +@@ -5542,7 +5531,7 @@ KeySym keysym; Context->flags.update = 2; break; case XK_w: @@ -123,7 +123,7 @@ if (do_menu) do_menu = -1; if (do_filesel) do_filesel = -1; if (do_zoom) do_zoom = -1; -@@ -5958,9 +5947,9 @@ +@@ -5958,9 +5947,9 @@ struct Sundata * Context; drawImageToRootWindow(Context, 0); XFlush(dpy); if (Context->flags.animate) { diff --git a/astro/sunclock/files/patch-sunclock.h b/astro/sunclock/files/patch-sunclock.h index 5c74ebaf16ea..1136c9a724e0 100644 --- a/astro/sunclock/files/patch-sunclock.h +++ b/astro/sunclock/files/patch-sunclock.h @@ -1,8 +1,8 @@ ---- sunclock.h.orig Sat Jul 21 11:49:41 2001 -+++ sunclock.h Sat Dec 8 21:28:41 2001 -@@ -224,7 +224,7 @@ - unsigned char * daypixel; /* pointer to day pixels */ +--- sunclock.h.orig 2006-10-14 14:25:18 UTC ++++ sunclock.h +@@ -238,7 +238,7 @@ typedef struct Sundata { unsigned char * nightpixel; /* pointer to night pixels */ + Pixel *vmfpixels; /* list of additional vmf pixels */ int ncolors; /* number of colors in day pixels */ - long time; /* time - real or fake, see flags */ + time_t footime; /* time - real or fake, see flags */ diff --git a/astro/sunclock/files/patch-tildepath.c b/astro/sunclock/files/patch-tildepath.c index ba98770cd368..4be22d0792b3 100644 --- a/astro/sunclock/files/patch-tildepath.c +++ b/astro/sunclock/files/patch-tildepath.c @@ -1,6 +1,6 @@ ---- tildepath.c.orig Fri Aug 24 07:06:53 2001 -+++ tildepath.c Fri Aug 24 07:06:59 2001 -@@ -38,7 +38,6 @@ +--- tildepath.c.orig 2000-09-01 15:34:51 UTC ++++ tildepath.c +@@ -38,7 +38,6 @@ T* AUTHOR #include #include #include diff --git a/astro/sunclock/files/patch-widgets.c b/astro/sunclock/files/patch-widgets.c index e15c78a91f13..82bb0345b739 100644 --- a/astro/sunclock/files/patch-widgets.c +++ b/astro/sunclock/files/patch-widgets.c @@ -1,5 +1,5 @@ ---- widgets.c.orig 2011-07-09 18:51:18.000000000 +0900 -+++ widgets.c 2012-08-14 04:13:36.000000000 +0900 +--- widgets.c.orig 2011-07-09 09:51:18 UTC ++++ widgets.c @@ -1,6 +1,5 @@ #include #include diff --git a/astro/wcslib/files/patch-GNUmakefile b/astro/wcslib/files/patch-GNUmakefile index a8e7c2b92dca..4d68d7f7293f 100644 --- a/astro/wcslib/files/patch-GNUmakefile +++ b/astro/wcslib/files/patch-GNUmakefile @@ -1,6 +1,6 @@ ---- GNUmakefile.orig 2012-03-14 13:40:38.000000000 +0600 -+++ GNUmakefile 2012-05-05 17:48:54.102866059 +0600 -@@ -81,26 +81,14 @@ +--- GNUmakefile.orig 2016-04-05 12:55:12 UTC ++++ GNUmakefile +@@ -81,26 +81,14 @@ install : $(MAKE) -k -C $$DIR $@ ; \ done $(INSTALL) -m 444 wcsconfig.h wcsconfig_f77.h $(INCDIR) diff --git a/astro/wmmoonclock/files/patch-Makefile b/astro/wmmoonclock/files/patch-Makefile index 82c272ebcf27..90f3f3c0b3b8 100644 --- a/astro/wmmoonclock/files/patch-Makefile +++ b/astro/wmmoonclock/files/patch-Makefile @@ -1,21 +1,16 @@ -*** Makefile.orig Tue Mar 23 11:20:32 1999 ---- Makefile Sun Nov 28 18:20:02 1999 -*************** -*** 1,8 **** -! CC = gcc -! CFLAGS = -O2 -! INCDIR = -I/usr/X11R6/include/X11 -! DESTDIR= /usr/X11R6 -! LIBDIR = -L/usr/X11R6/lib - - # for Linux - LIBS = -lXpm -lX11 -lXext ---- 1,8 ---- -! CC ?= gcc -! CFLAGS ?= -O2 -! INCDIR = -I${LOCALBASE}/include -! DESTDIR= ${PREFIX} -! LIBDIR = -L${LOCALBASE}/lib - - # for Linux - LIBS = -lXpm -lX11 -lXext +--- Makefile.orig 1999-03-23 02:20:32 UTC ++++ Makefile +@@ -1,8 +1,8 @@ +-CC = gcc +-CFLAGS = -O2 +-INCDIR = -I/usr/X11R6/include/X11 +-DESTDIR= /usr/X11R6 +-LIBDIR = -L/usr/X11R6/lib ++CC ?= gcc ++CFLAGS ?= -O2 ++INCDIR = -I${LOCALBASE}/include ++DESTDIR= ${PREFIX} ++LIBDIR = -L${LOCALBASE}/lib + + # for Linux + LIBS = -lXpm -lX11 -lXext diff --git a/astro/wmmoonclock/files/patch-wmMoonClock.c b/astro/wmmoonclock/files/patch-wmMoonClock.c index edec5c503d21..0370a73fd733 100644 --- a/astro/wmmoonclock/files/patch-wmMoonClock.c +++ b/astro/wmmoonclock/files/patch-wmMoonClock.c @@ -1,6 +1,6 @@ ---- wmMoonClock.c.orig Thu Aug 15 18:15:26 2002 -+++ wmMoonClock.c Thu Aug 15 18:15:51 2002 -@@ -162,7 +162,8 @@ +--- wmMoonClock.c.orig 1999-06-07 14:27:18 UTC ++++ wmMoonClock.c +@@ -162,7 +162,8 @@ int main(int argc, char *argv[]) { int i, n, k, j, ImageNumber; int Year, Month, DayOfWeek, DayOfMonth; int Hours, Mins, Secs, OldSecs, digit, xoff, xsize; diff --git a/astro/wmsolar/files/patch-Makefile b/astro/wmsolar/files/patch-Makefile index 4e76bbdfb27b..872ea28528bb 100644 --- a/astro/wmsolar/files/patch-Makefile +++ b/astro/wmsolar/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2016-06-20 12:40:27 UTC +--- Makefile.orig 2016-07-26 13:20:30 UTC +++ Makefile @@ -1,8 +1,6 @@ -CC = g++ diff --git a/astro/wmsolar/files/patch-Vsop.h b/astro/wmsolar/files/patch-Vsop.h index b43c3e292aa0..91ec3fd03f1c 100644 --- a/astro/wmsolar/files/patch-Vsop.h +++ b/astro/wmsolar/files/patch-Vsop.h @@ -1,4 +1,4 @@ ---- Vsop.h.orig 2016-06-20 12:40:27 UTC +--- Vsop.h.orig 2016-07-26 13:20:30 UTC +++ Vsop.h @@ -12,6 +12,7 @@ #define VSOP__H diff --git a/astro/wmspaceweather/files/patch-GetKp b/astro/wmspaceweather/files/patch-GetKp index 55c2633e1c05..e65e1700318d 100644 --- a/astro/wmspaceweather/files/patch-GetKp +++ b/astro/wmspaceweather/files/patch-GetKp @@ -1,5 +1,5 @@ ---- ./GetKp.orig 1999-02-12 06:42:01.000000000 +0100 -+++ ./GetKp 2014-04-04 21:55:15.059689500 +0200 +--- GetKp.orig 1999-02-12 05:42:01 UTC ++++ GetKp @@ -5,7 +5,7 @@ # diff --git a/astro/wmspaceweather/files/patch-Makefile b/astro/wmspaceweather/files/patch-Makefile index 67dd3990d14d..6a985e4f4eea 100644 --- a/astro/wmspaceweather/files/patch-Makefile +++ b/astro/wmspaceweather/files/patch-Makefile @@ -1,5 +1,5 @@ ---- ./Makefile.orig 1999-01-04 22:20:45.000000000 +0100 -+++ ./Makefile 2014-04-04 21:55:35.196529518 +0200 +--- Makefile.orig 1999-01-04 21:20:45 UTC ++++ Makefile @@ -1,8 +1,7 @@ -CC = gcc -CFLAGS = -O2 -Wall @@ -13,7 +13,7 @@ # for linux LIBS = -lXpm -lX11 -lXext # for Solaris -@@ -12,14 +11,14 @@ +@@ -12,14 +11,14 @@ OBJS = wmSpaceWeather.o \ .c.o: @@ -30,7 +30,7 @@ clean: for i in $(OBJS) ; do \ -@@ -28,7 +27,7 @@ +@@ -28,7 +27,7 @@ clean: rm -f wmSpaceWeather install:: wmSpaceWeather diff --git a/astro/wmspaceweather/files/patch-wmSpaceWeather.c b/astro/wmspaceweather/files/patch-wmSpaceWeather.c index 5834dac43ff8..6f22d3ac4693 100644 --- a/astro/wmspaceweather/files/patch-wmSpaceWeather.c +++ b/astro/wmspaceweather/files/patch-wmSpaceWeather.c @@ -1,6 +1,6 @@ ---- ./wmSpaceWeather.c.orig 1999-02-18 18:57:45.000000000 +0100 -+++ ./wmSpaceWeather.c 2014-04-04 21:55:15.061690087 +0200 -@@ -115,7 +115,7 @@ +--- wmSpaceWeather.c.orig 1999-02-18 17:57:45 UTC ++++ wmSpaceWeather.c +@@ -115,7 +115,7 @@ XEvent event; int i, n, s, k, m, dt1, dt2; int Year, Month, Day, DayOfMonth, OldDayOfMonth; int Hours, Mins, Secs, OldSecs, xoff, D[10], xsize; @@ -9,7 +9,7 @@ int height, UpToDate, LEDOn; double UT, TU, TU2, TU3, T0, gmst, hour24(); -@@ -126,6 +126,7 @@ +@@ -126,6 +126,7 @@ int Kp[8] = { -1, -1, -1, -1, -1, -1, double E1, E2, P1, P2, P3; char Xray[10], digit[2]; FILE *fp; @@ -17,7 +17,7 @@ -@@ -249,13 +250,13 @@ +@@ -249,13 +250,13 @@ FILE *fp; /* @@ -33,7 +33,7 @@ dt2 = 0; -@@ -272,13 +273,13 @@ +@@ -272,13 +273,13 @@ FILE *fp; Secs = Time->tm_sec; UT = (double)Hours + (double)Mins/60.0 + (double)Secs/3600.0; CurrentJD = jd(Year, Month, Day, UT); @@ -49,7 +49,7 @@ for (i=0; i<8; ++i){ fscanf(fp, "%ld %d", &TimeTag[i], &Kp[i]); -@@ -289,7 +290,7 @@ +@@ -289,7 +290,7 @@ FILE *fp; fscanf(fp, "%lf", &P3); fscanf(fp, "%lf", &E1); fscanf(fp, "%lf", &E2); @@ -58,7 +58,7 @@ fclose(fp); } else { -@@ -318,7 +319,7 @@ +@@ -318,7 +319,7 @@ FILE *fp; LatestAvailJD = jd(Year, Month, Day, UT); DeltaT = (CurrentJD - LatestAvailJD)*24.0; @@ -67,7 +67,7 @@ if (!UpToDate){ -@@ -560,7 +561,7 @@ +@@ -560,7 +561,7 @@ void ParseCMDLine(int argc, char *argv[] } else if ((!strcmp(argv[i], "-url"))||(!strcmp(argv[i], "-u"))){ @@ -76,7 +76,7 @@ } else { -@@ -651,7 +652,7 @@ +@@ -651,7 +652,7 @@ void pressEvent(XButtonEvent *xev){ if (GotDoubleClick1) { GotFirstClick1 = 0; GotDoubleClick1 = 0; diff --git a/astro/wmsun/files/patch-Makefile b/astro/wmsun/files/patch-Makefile index 20562229be26..d21e0a79ec8e 100644 --- a/astro/wmsun/files/patch-Makefile +++ b/astro/wmsun/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig Wed Jan 6 11:28:39 1999 -+++ Makefile Thu Aug 3 21:28:34 2000 -@@ -18,12 +18,12 @@ +--- Makefile.orig 2015-04-01 21:05:45 UTC ++++ Makefile +@@ -18,12 +18,12 @@ LIBS = -lXpm -lX11 -lXext -lm OBJS = wmSun.o SunRise.o ../wmgeneral/wmgeneral.o .c.o: diff --git a/astro/wmsun/files/patch-wmSun.c b/astro/wmsun/files/patch-wmSun.c index 45b0541943da..7f5293d03e28 100644 --- a/astro/wmsun/files/patch-wmSun.c +++ b/astro/wmsun/files/patch-wmSun.c @@ -1,6 +1,6 @@ ---- wmSun.c.orig Thu Aug 15 18:04:04 2002 -+++ wmSun.c Thu Aug 15 18:06:24 2002 -@@ -76,7 +76,8 @@ +--- wmSun.c.orig 2015-04-01 21:07:58 UTC ++++ wmSun.c +@@ -76,7 +76,8 @@ int main(int argc, char *argv[]) { int LocalDayOfMonth, DayOfMonth; int Hours, Mins, Secs, OldSecs, digit, xoff, xsize; int OldMins; diff --git a/astro/xglobe/files/patch-Makefile b/astro/xglobe/files/patch-Makefile index c408904c8fcb..e1d88a8e4bc2 100644 --- a/astro/xglobe/files/patch-Makefile +++ b/astro/xglobe/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 1999-07-19 05:56:27.000000000 -0700 -+++ Makefile 2011-01-19 09:39:21.000000000 -0800 +--- Makefile.orig 1999-07-19 12:56:27 UTC ++++ Makefile @@ -4,43 +4,44 @@ ####### Installation directory diff --git a/astro/xglobe/files/patch-desktopwidget.cpp b/astro/xglobe/files/patch-desktopwidget.cpp index 9ef3e1498445..b1100d7e911c 100644 --- a/astro/xglobe/files/patch-desktopwidget.cpp +++ b/astro/xglobe/files/patch-desktopwidget.cpp @@ -1,5 +1,5 @@ ---- desktopwidget.cpp.orig 1998-12-09 10:15:52.000000000 -0800 -+++ desktopwidget.cpp 2011-01-18 22:40:26.000000000 -0800 +--- desktopwidget.cpp.orig 1998-12-09 18:15:52 UTC ++++ desktopwidget.cpp @@ -18,10 +18,14 @@ */ @@ -16,7 +16,7 @@ { haveImage = FALSE; currentImage = new QPixmap(width(), height()); -@@ -43,6 +47,7 @@ +@@ -43,6 +47,7 @@ void DesktopWidget::paintEvent(QPaintEve { QPainter p(this); @@ -24,7 +24,7 @@ if(!haveImage) { p.setFont(QFont("helvetica", 35)); -@@ -62,7 +67,8 @@ +@@ -62,7 +67,8 @@ void DesktopWidget::paintEvent(QPaintEve void DesktopWidget::updateDisplay(QImage *image) { diff --git a/astro/xglobe/files/patch-desktopwidget.h b/astro/xglobe/files/patch-desktopwidget.h index 1824d35063a0..10f19eddd27b 100644 --- a/astro/xglobe/files/patch-desktopwidget.h +++ b/astro/xglobe/files/patch-desktopwidget.h @@ -1,5 +1,5 @@ ---- desktopwidget.h.orig 1998-12-09 10:16:54.000000000 -0800 -+++ desktopwidget.h 2011-01-18 14:22:52.000000000 -0800 +--- desktopwidget.h.orig 1998-12-09 18:16:54 UTC ++++ desktopwidget.h @@ -23,6 +23,8 @@ #include #include diff --git a/astro/xglobe/files/patch-earthapp.cpp b/astro/xglobe/files/patch-earthapp.cpp index 76941cf6958e..0ada8e01a975 100644 --- a/astro/xglobe/files/patch-earthapp.cpp +++ b/astro/xglobe/files/patch-earthapp.cpp @@ -1,5 +1,5 @@ ---- earthapp.cpp.orig 1999-12-06 08:14:10.000000000 -0800 -+++ earthapp.cpp 2011-01-19 09:28:15.000000000 -0800 +--- earthapp.cpp.orig 1999-12-06 16:14:10 UTC ++++ earthapp.cpp @@ -69,6 +69,12 @@ #include "config.h" #include "earthapp.h" @@ -13,7 +13,7 @@ /* ------------------------------------------------------------------------*/ -@@ -334,7 +340,7 @@ +@@ -334,7 +340,7 @@ EarthApplication::EarthApplication(int & if(use_kde) { dwidget = new DesktopWidget(); @@ -22,7 +22,7 @@ dwidget->update(); } } -@@ -343,9 +349,9 @@ +@@ -343,9 +349,9 @@ EarthApplication::EarthApplication(int & EarthApplication::~EarthApplication(void) { @@ -34,7 +34,7 @@ timer->stop(); delete timer; -@@ -937,8 +943,8 @@ +@@ -937,8 +943,8 @@ void EarthApplication::readOutFileName(i void EarthApplication::randomPosition() { @@ -45,7 +45,7 @@ } /* ------------------------------------------------------------------------*/ -@@ -1233,7 +1239,7 @@ +@@ -1233,7 +1239,7 @@ void EarthApplication::init() r->setRotation(rotation); timer = new QTimer(this); @@ -54,7 +54,7 @@ connect(timer, SIGNAL(timeout()), this, SLOT(recalc())); QTimer::singleShot(1, this, SLOT(recalc())); // this will start rendering -@@ -1307,7 +1313,19 @@ +@@ -1307,7 +1313,19 @@ void EarthApplication::recalc() { QPixmap pm; pm.convertFromImage(*(r->getImage())); diff --git a/astro/xglobe/files/patch-earthapp.h b/astro/xglobe/files/patch-earthapp.h index ad7ba6e0662a..bfbc68eca831 100644 --- a/astro/xglobe/files/patch-earthapp.h +++ b/astro/xglobe/files/patch-earthapp.h @@ -1,5 +1,5 @@ ---- earthapp.h.orig 1999-12-06 08:14:23.000000000 -0800 -+++ earthapp.h 2011-01-18 14:22:52.000000000 -0800 +--- earthapp.h.orig 1999-12-06 16:14:23 UTC ++++ earthapp.h @@ -54,6 +54,8 @@ #define _EARTHAPP_H diff --git a/astro/xglobe/files/patch-main.cpp b/astro/xglobe/files/patch-main.cpp index 505b961f3df7..9e207ebd2d55 100644 --- a/astro/xglobe/files/patch-main.cpp +++ b/astro/xglobe/files/patch-main.cpp @@ -1,5 +1,5 @@ ---- main.cpp.orig 1999-07-13 10:32:55.000000000 -0700 -+++ main.cpp 2011-01-18 14:22:52.000000000 -0800 +--- main.cpp.orig 1999-07-13 17:32:55 UTC ++++ main.cpp @@ -24,6 +24,7 @@ */ @@ -8,7 +8,7 @@ #include #include #include "config.h" -@@ -37,6 +38,8 @@ +@@ -37,6 +38,8 @@ int main(int argc, char **argv) { EarthApplication myApp(argc, argv); diff --git a/astro/xglobe/files/patch-marker.xpm b/astro/xglobe/files/patch-marker.xpm index 4cfec031a041..96bc338cef45 100644 --- a/astro/xglobe/files/patch-marker.xpm +++ b/astro/xglobe/files/patch-marker.xpm @@ -1,5 +1,5 @@ ---- marker.xpm.orig 1998-11-20 09:16:30.000000000 -0800 -+++ marker.xpm 2011-01-19 09:32:52.000000000 -0800 +--- marker.xpm.orig 1998-11-20 17:16:30 UTC ++++ marker.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * marker_xpm[] = { diff --git a/astro/xglobe/files/patch-markerlist.cpp b/astro/xglobe/files/patch-markerlist.cpp index 16e6d3e45e02..574670a0b654 100644 --- a/astro/xglobe/files/patch-markerlist.cpp +++ b/astro/xglobe/files/patch-markerlist.cpp @@ -1,5 +1,5 @@ ---- markerlist.cpp.orig 1999-07-13 11:13:41.000000000 -0700 -+++ markerlist.cpp 2011-01-18 14:22:52.000000000 -0800 +--- markerlist.cpp.orig 1999-07-13 18:13:41 UTC ++++ markerlist.cpp @@ -28,7 +28,7 @@ #include "markerlist.h" @@ -9,7 +9,7 @@ /* ------------------------------------------------------------------------ */ -@@ -94,11 +94,11 @@ +@@ -94,11 +94,11 @@ bool MarkerList::loadMarkerFile(const ch int pos1; int pos2; QFile f(filename); diff --git a/astro/xglobe/files/patch-markerlist.h b/astro/xglobe/files/patch-markerlist.h index 82cb67d79370..8c1c648cdee0 100644 --- a/astro/xglobe/files/patch-markerlist.h +++ b/astro/xglobe/files/patch-markerlist.h @@ -1,6 +1,6 @@ ---- markerlist.h.orig 1999-07-13 11:14:07.000000000 -0700 -+++ markerlist.h 2011-01-18 14:22:52.000000000 -0800 -@@ -56,21 +56,23 @@ +--- markerlist.h.orig 1999-07-13 18:14:07 UTC ++++ markerlist.h +@@ -56,21 +56,23 @@ private: class MarkerList { public: diff --git a/astro/xglobe/files/patch-renderer.cpp b/astro/xglobe/files/patch-renderer.cpp index 49e57136982f..ea7375cae596 100644 --- a/astro/xglobe/files/patch-renderer.cpp +++ b/astro/xglobe/files/patch-renderer.cpp @@ -1,6 +1,6 @@ ---- renderer.cpp.orig 1999-12-06 08:13:35.000000000 -0800 -+++ renderer.cpp 2011-01-18 14:22:52.000000000 -0800 -@@ -123,7 +123,7 @@ +--- renderer.cpp.orig 1999-12-06 16:13:35 UTC ++++ renderer.cpp +@@ -123,7 +123,7 @@ Renderer::Renderer(const QSize &size, co this->ambientGreen = 0.15; this->ambientBlue = 0.15; this->markerpixmap = new QPixmap((const char **)marker_xpm); @@ -9,7 +9,7 @@ this->show_label = TRUE; this->gridtype = NO_GRID; this->d_gridline = 15.0*PI/180.; -@@ -448,7 +448,7 @@ +@@ -448,7 +448,7 @@ double Renderer::getZoom() void Renderer::setMarkerList(MarkerList *l) { @@ -18,7 +18,7 @@ markerlist = l; } -@@ -1136,7 +1136,7 @@ +@@ -1136,7 +1136,7 @@ void Renderer::drawMarkers() Location **visible_locations; visible_locations = new Location*[markerlist->count()]; @@ -27,7 +27,7 @@ // Matrix M of renderFrame, but transposed m11 = cos(rot)*cos(view_long)-sin(view_lat)*sin(view_long)*sin(rot); -@@ -1151,8 +1151,9 @@ +@@ -1151,8 +1151,9 @@ void Renderer::drawMarkers() visible_angle = radius/center_dist; @@ -38,7 +38,7 @@ lon = l->getLongitude()*PI/180.; lat = l->getLatitude()*PI/180.; -@@ -1185,12 +1186,9 @@ +@@ -1185,12 +1186,9 @@ void Renderer::drawMarkers() l->x = screen_x + shift_x; l->y = screen_y + shift_y; @@ -52,7 +52,7 @@ // sort the markers according to depth qsort(visible_locations, num, sizeof(Location *), Renderer::compareLocations); -@@ -1208,8 +1206,8 @@ +@@ -1208,8 +1206,8 @@ int Renderer::compareLocations(const voi { double c1, c2; @@ -63,7 +63,7 @@ if(c1 > c2) return 1; -@@ -1364,7 +1362,7 @@ +@@ -1364,7 +1362,7 @@ QImage *Renderer::getImage() QImage *clonedImage = NULL; clonedImage = new QImage(*renderedImage); @@ -72,7 +72,7 @@ return clonedImage; } -@@ -1391,7 +1389,7 @@ +@@ -1391,7 +1389,7 @@ void Renderer::paintMarker(int x, int y, #if QT_VERSION >= 200 p.setPen(Qt::black); #else @@ -81,7 +81,7 @@ #endif wx = -br.x()+markerpixmap->width()+2; wy = -br.y(); -@@ -1434,7 +1432,7 @@ +@@ -1434,7 +1432,7 @@ void Renderer::paintMarker(int x, int y, for(wx=0 ; wxtm_isdst], -@@ -1499,7 +1497,7 @@ +@@ -1499,7 +1497,7 @@ void Renderer::drawLabel() QRect br = fm.boundingRect(0, 0, 0, 0, Qt::AlignLeft|Qt::AlignTop, labelstring); #else @@ -110,7 +110,7 @@ #endif QPixmap pm(br.width()+10, br.height()+10); -@@ -1512,8 +1510,8 @@ +@@ -1512,8 +1510,8 @@ void Renderer::drawLabel() p.drawText(5, 5, br.width(), br.height(), Qt::AlignLeft|Qt::AlignTop, labelstring); #else @@ -121,7 +121,7 @@ #endif p.end(); -@@ -1562,9 +1560,9 @@ +@@ -1562,9 +1560,9 @@ void Renderer::drawStars() for(int i=0; i #endif /*SYS5*/ @@ -22,7 +22,7 @@ (void) time( &clock ); return dlocaltime( &clock ); -@@ -40,7 +47,7 @@ +@@ -40,7 +47,7 @@ dtwstime() struct tws* dlocaltime( clock ) @@ -31,7 +31,7 @@ { register struct tm* tm; #ifndef SYS5 -@@ -48,7 +55,7 @@ +@@ -48,7 +55,7 @@ dlocaltime( clock ) #endif not SYS5 static struct tws tw; diff --git a/astro/xphoon/files/patch-xphoon.c b/astro/xphoon/files/patch-xphoon.c index e09711110328..8d430fa70c00 100644 --- a/astro/xphoon/files/patch-xphoon.c +++ b/astro/xphoon/files/patch-xphoon.c @@ -1,6 +1,6 @@ ---- xphoon.c.orig Thu Sep 19 04:57:37 1991 -+++ xphoon.c Sun Jan 3 18:30:29 1999 -@@ -20,7 +20,6 @@ +--- xphoon.c.orig 2000-06-13 21:50:16 UTC ++++ xphoon.c +@@ -20,7 +20,6 @@ static char rcsid[] = #include "vroot.h" #include #include /* added by David Frey */ @@ -8,8 +8,8 @@ #include /* added by David Frey */ #include #include /* added by Lalo Martins */ -@@ -65,7 +74,7 @@ - int blackflag, demoflag; +@@ -65,7 +64,7 @@ main( argc, argv ) + int blackflag, demoflag, southflag; int printpid; char* display_name; - long clock; diff --git a/astro/xworld/files/patch-compile_world.c b/astro/xworld/files/patch-compile__world.c similarity index 56% rename from astro/xworld/files/patch-compile_world.c rename to astro/xworld/files/patch-compile__world.c index 9c457be19215..9404597d3a7f 100644 --- a/astro/xworld/files/patch-compile_world.c +++ b/astro/xworld/files/patch-compile__world.c @@ -1,5 +1,5 @@ ---- compile_world.c.orig 2009-03-27 17:51:01.000000000 +0100 -+++ compile_world.c 2009-03-27 17:51:15.000000000 +0100 +--- compile_world.c.orig 1999-07-28 13:13:51 UTC ++++ compile_world.c @@ -33,6 +33,7 @@ #include #include diff --git a/astro/xworld/files/patch-pad.c b/astro/xworld/files/patch-pad.c index f132d1983ae8..a5d98ea9271b 100644 --- a/astro/xworld/files/patch-pad.c +++ b/astro/xworld/files/patch-pad.c @@ -1,5 +1,5 @@ ---- pad.c.orig 2009-03-27 17:49:37.000000000 +0100 -+++ pad.c 2009-03-27 17:50:01.000000000 +0100 +--- pad.c.orig 1999-07-28 13:31:27 UTC ++++ pad.c @@ -35,6 +35,7 @@ #include #include diff --git a/astro/xworld/files/patch-xworld_c b/astro/xworld/files/patch-xworld.c similarity index 98% rename from astro/xworld/files/patch-xworld_c rename to astro/xworld/files/patch-xworld.c index 63cc59e8a531..8a81ab6dc5e0 100644 --- a/astro/xworld/files/patch-xworld_c +++ b/astro/xworld/files/patch-xworld.c @@ -1,5 +1,5 @@ ---- xworld.c.orig Wed Jul 28 17:39:11 1999 -+++ xworld.c Sat Aug 11 21:23:01 2001 +--- xworld.c.orig 1999-07-28 15:39:11 UTC ++++ xworld.c @@ -63,6 +63,8 @@ #define BORDER 5 #define SLEEP 120 diff --git a/audio/Maaate/files/patch-configure b/audio/Maaate/files/patch-configure index 26f22fadc73a..0820e50a1fb7 100644 --- a/audio/Maaate/files/patch-configure +++ b/audio/Maaate/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2002-10-09 03:30:34.000000000 +0200 -+++ configure 2013-12-18 12:38:19.000000000 +0100 -@@ -5699,7 +5699,6 @@ +--- configure.orig 2002-10-09 01:30:34 UTC ++++ configure +@@ -5699,7 +5699,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo diff --git a/audio/aacgain/files/patch-faad2_libfaad_common.h b/audio/aacgain/files/patch-faad2_libfaad_common.h index dfa709b503f8..dfb19b59e344 100644 --- a/audio/aacgain/files/patch-faad2_libfaad_common.h +++ b/audio/aacgain/files/patch-faad2_libfaad_common.h @@ -1,6 +1,6 @@ ---- faad2/libfaad/common.h.orig Sun May 28 19:33:36 2006 -+++ faad2/libfaad/common.h Sun May 28 19:35:11 2006 -@@ -302,6 +302,7 @@ +--- faad2/libfaad/common.h.orig 2004-09-08 09:43:12 UTC ++++ faad2/libfaad/common.h +@@ -302,6 +302,7 @@ char *strchr(), *strrchr(); return i; } #elif (defined(__i386__) && defined(__GNUC__)) @@ -8,7 +8,7 @@ #define HAS_LRINTF // from http://www.stereopsis.com/FPU.html static INLINE int lrintf(float f) -@@ -315,7 +316,7 @@ +@@ -315,7 +316,7 @@ char *strchr(), *strrchr(); return i; } #endif diff --git a/audio/acoustid-fingerprinter/files/patch-decoder.h b/audio/acoustid-fingerprinter/files/patch-decoder.h index e1d52b050f75..6c3df3f3285b 100644 --- a/audio/acoustid-fingerprinter/files/patch-decoder.h +++ b/audio/acoustid-fingerprinter/files/patch-decoder.h @@ -1,6 +1,6 @@ ---- decoder.h.orig 2013-10-21 12:47:16.077685162 -0200 -+++ decoder.h 2013-10-21 12:47:47.588683149 -0200 -@@ -35,6 +35,10 @@ +--- decoder.h.orig 2012-09-05 18:43:51 UTC ++++ decoder.h +@@ -35,6 +35,10 @@ extern "C" { } #include "fingerprintcalculator.h" diff --git a/audio/aften/files/patch-libaften__cpu_caps.h b/audio/aften/files/patch-libaften_cpu__caps.h similarity index 63% rename from audio/aften/files/patch-libaften__cpu_caps.h rename to audio/aften/files/patch-libaften_cpu__caps.h index df018924efc2..b4b196655367 100644 --- a/audio/aften/files/patch-libaften__cpu_caps.h +++ b/audio/aften/files/patch-libaften_cpu__caps.h @@ -1,5 +1,5 @@ ---- ./libaften/cpu_caps.h.orig 2007-08-11 18:13:25.000000000 +0200 -+++ ./libaften/cpu_caps.h 2010-04-03 00:31:40.000000000 +0200 +--- libaften/cpu_caps.h.orig 2007-08-11 16:13:25 UTC ++++ libaften/cpu_caps.h @@ -26,6 +26,7 @@ #include "ppc_cpu_caps.h" #else diff --git a/audio/alienwah/files/patch-aw.cpp b/audio/alienwah/files/patch-aw.cpp index 29267cc30a31..fe62555116fb 100644 --- a/audio/alienwah/files/patch-aw.cpp +++ b/audio/alienwah/files/patch-aw.cpp @@ -1,6 +1,6 @@ ---- aw.cpp.orig 2002-01-26 02:51:03.000000000 +0900 -+++ aw.cpp 2013-12-04 04:50:18.000000000 +0900 -@@ -62,11 +62,11 @@ +--- aw.cpp.orig 2002-01-25 17:51:03 UTC ++++ aw.cpp +@@ -62,11 +62,11 @@ The output of this effect is the real pa /*****************************************************************************/ @@ -17,7 +17,7 @@ /*****************************************************************************/ -@@ -85,6 +85,8 @@ +@@ -85,6 +85,8 @@ The output of this effect is the real pa #define AW_INPUT2 6 #define AW_OUTPUT2 7 @@ -26,7 +26,7 @@ /*****************************************************************************/ /* Make number of samples represented by 'delay' proportional to * the sample rate, such that delay=1 is 1 sample buffer at -@@ -118,10 +120,10 @@ +@@ -118,10 +120,10 @@ unsigned long t; //?? unsigned long t2; //?? unsigned long k; // index for delaybuf unsigned long k2; // index for delaybuf2 @@ -41,7 +41,7 @@ float freq; float startphase; float feedback; -@@ -135,25 +137,61 @@ +@@ -135,25 +137,61 @@ AW(const long lSampleRate) : samplerate(lSampleRate), t(0), t2(0), k(0), k2(0), @@ -86,10 +86,10 @@ + delaybuf[i] = std::complex(0,0); + } +} - ++ +}; + -+ + +/* + * simply calls the constructor + */ @@ -111,7 +111,7 @@ switch (port) { case AW_FREQ: ((AW *)instance)->lfreq = *datalocation; -@@ -182,41 +220,19 @@ +@@ -182,41 +220,19 @@ friend void connectPortToAW(LADSPA_Handl * connect_port may be called before of after here, so we * cannot rely upon port data for initialization */ @@ -158,7 +158,7 @@ float lfoskip = me->freq * 2 * PI / me->samplerate; if (! me->inited) me->initState(1); -@@ -224,7 +240,7 @@ +@@ -224,7 +240,7 @@ friend void runAW_Mono(LADSPA_Handle ins for(unsigned int i=0; it++ % LFO_SKIPSAMPLES) == 0) { lfo = 1 + cos(me->t * lfoskip + me->startphase); @@ -167,7 +167,7 @@ sin(lfo) * me->feedback); } outc = me->c * me->delaybuf[me->k] + (1 - me->feedback) * -@@ -238,10 +254,11 @@ +@@ -238,10 +254,11 @@ friend void runAW_Mono(LADSPA_Handle ins /* * Stereo effect? */ @@ -181,7 +181,7 @@ float lfoskip = me->freq * 2 * PI / me->samplerate; if (! me->inited) me->initState(2); -@@ -249,7 +266,7 @@ +@@ -249,7 +266,7 @@ friend void runAW_Stereo(LADSPA_Handle i for(unsigned int i=0; it++ % LFO_SKIPSAMPLES) == 0) { lfo = 1 + cos(me->t * lfoskip + me->startphase); @@ -190,7 +190,7 @@ sin(lfo) * me->feedback); } outc = me->c * me->delaybuf[me->k] + (1 - me->feedback) * -@@ -262,7 +279,7 @@ +@@ -262,7 +279,7 @@ friend void runAW_Stereo(LADSPA_Handle i for(unsigned int i=0; it2++ % LFO_SKIPSAMPLES) == 0) { lfo = 1 + cos(me->t2 * lfoskip); @@ -199,7 +199,7 @@ sin(lfo) * me->feedback); } outc = me->c2 * me->delaybuf2[me->k2] + (1 - me->feedback) * -@@ -273,13 +290,11 @@ +@@ -273,13 +290,11 @@ friend void runAW_Stereo(LADSPA_Handle i } } @@ -216,7 +216,7 @@ /*****************************************************************************/ typedef char * char_ptr; -@@ -342,7 +357,7 @@ +@@ -342,7 +357,7 @@ StartupShutdownHandler() { desc[plug]->PortCount = 6; portdesc @@ -225,7 +225,7 @@ desc[plug]->PortDescriptors = (const LADSPA_PortDescriptor *)portdesc; portdesc[AW_FREQ] -@@ -358,7 +373,7 @@ +@@ -358,7 +373,7 @@ StartupShutdownHandler() { portdesc[AW_OUTPUT1] = LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO; pnames @@ -234,7 +234,7 @@ desc[plug]->PortNames = (const char **)pnames; pnames[AW_FREQ] -@@ -376,7 +391,7 @@ +@@ -376,7 +391,7 @@ StartupShutdownHandler() { /* range hints */ rangehints @@ -243,7 +243,7 @@ desc[plug]->PortRangeHints = (const LADSPA_PortRangeHint *)rangehints; -@@ -417,7 +432,7 @@ +@@ -417,7 +432,7 @@ StartupShutdownHandler() { desc[plug]->PortCount = 8; portdesc @@ -252,7 +252,7 @@ desc[plug]->PortDescriptors = (const LADSPA_PortDescriptor *)portdesc; portdesc[AW_FREQ] -@@ -437,7 +452,7 @@ +@@ -437,7 +452,7 @@ StartupShutdownHandler() { portdesc[AW_OUTPUT1] = LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO; pnames @@ -261,7 +261,7 @@ desc[plug]->PortNames = (const char **)pnames; pnames[AW_FREQ] -@@ -459,7 +474,7 @@ +@@ -459,7 +474,7 @@ StartupShutdownHandler() { /* range hints */ rangehints diff --git a/audio/alsa-lib/files/patch-include__pcm.h b/audio/alsa-lib/files/patch-include_pcm.h similarity index 82% rename from audio/alsa-lib/files/patch-include__pcm.h rename to audio/alsa-lib/files/patch-include_pcm.h index ab9f6709a3dd..6dd552dd0db4 100644 --- a/audio/alsa-lib/files/patch-include__pcm.h +++ b/audio/alsa-lib/files/patch-include_pcm.h @@ -1,4 +1,4 @@ ---- include/pcm.h~ +--- include/pcm.h.orig 2016-03-31 13:10:39 UTC +++ include/pcm.h @@ -29,6 +29,13 @@ #ifndef __ALSA_PCM_H diff --git a/audio/alsa-lib/files/patch-src__async.c b/audio/alsa-lib/files/patch-src_async.c similarity index 94% rename from audio/alsa-lib/files/patch-src__async.c rename to audio/alsa-lib/files/patch-src_async.c index 09d019004c13..2502546a94cf 100644 --- a/audio/alsa-lib/files/patch-src__async.c +++ b/audio/alsa-lib/files/patch-src_async.c @@ -1,6 +1,6 @@ $NetBSD: patch-bk,v 1.1 2008/12/25 13:18:00 hasso Exp $ ---- src/async.c~ +--- src/async.c.orig 2016-03-31 13:10:39 UTC +++ src/async.c @@ -51,6 +51,15 @@ static LIST_HEAD(snd_async_handlers); diff --git a/audio/alsa-lib/files/patch-src__pcm__pcm_direct.c b/audio/alsa-lib/files/patch-src_pcm_pcm__direct.c similarity index 89% rename from audio/alsa-lib/files/patch-src__pcm__pcm_direct.c rename to audio/alsa-lib/files/patch-src_pcm_pcm__direct.c index ba2ee2b2e6af..02e5d5e4ade6 100644 --- a/audio/alsa-lib/files/patch-src__pcm__pcm_direct.c +++ b/audio/alsa-lib/files/patch-src_pcm_pcm__direct.c @@ -1,4 +1,4 @@ ---- src/pcm/pcm_direct.c~ +--- src/pcm/pcm_direct.c.orig 2016-03-31 13:10:39 UTC +++ src/pcm/pcm_direct.c @@ -44,12 +44,16 @@ * diff --git a/audio/alsa-lib/files/patch-test_midifile.c b/audio/alsa-lib/files/patch-test_midifile.c index 7a176a056abd..7c970b7548af 100644 --- a/audio/alsa-lib/files/patch-test_midifile.c +++ b/audio/alsa-lib/files/patch-test_midifile.c @@ -1,4 +1,4 @@ ---- test/midifile.c.orig 2015-02-26 12:34:52 UTC +--- test/midifile.c.orig 2016-03-31 13:10:39 UTC +++ test/midifile.c @@ -71,7 +71,7 @@ #endif diff --git a/audio/alsa-plugins/files/patch-arcam-av-arcam_av.c b/audio/alsa-plugins/files/patch-arcam-av_arcam__av.c similarity index 82% rename from audio/alsa-plugins/files/patch-arcam-av-arcam_av.c rename to audio/alsa-plugins/files/patch-arcam-av_arcam__av.c index 2826201f10a5..814076306326 100644 --- a/audio/alsa-plugins/files/patch-arcam-av-arcam_av.c +++ b/audio/alsa-plugins/files/patch-arcam-av_arcam__av.c @@ -1,4 +1,4 @@ ---- arcam-av/arcam_av.c.orig +--- arcam-av/arcam_av.c.orig 2016-03-31 13:11:29 UTC +++ arcam-av/arcam_av.c @@ -27,6 +27,7 @@ #include @@ -8,7 +8,7 @@ #include #include -@@ -37,6 +38,8 @@ +@@ -38,6 +39,8 @@ #include #include diff --git a/audio/alsa-plugins/files/patch-configure b/audio/alsa-plugins/files/patch-configure index a0da753a0c6d..a44bae152692 100644 --- a/audio/alsa-plugins/files/patch-configure +++ b/audio/alsa-plugins/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2010-04-16 13:18:56.000000000 +0200 -+++ configure 2010-05-11 00:08:29.000000000 +0200 -@@ -19608,14 +19608,6 @@ else +--- configure.orig 2016-03-31 13:14:07 UTC ++++ configure +@@ -12402,14 +12402,6 @@ else $as_echo "yes" >&6; } HAVE_SPEEXDSP="yes" fi @@ -15,7 +15,7 @@ # Check whether --with-speex was given. -@@ -19626,6 +19618,15 @@ else +@@ -12420,6 +12412,15 @@ else fi diff --git a/audio/alsa-plugins/files/patch-oss-ctl_oss.c b/audio/alsa-plugins/files/patch-oss_ctl__oss.c similarity index 92% rename from audio/alsa-plugins/files/patch-oss-ctl_oss.c rename to audio/alsa-plugins/files/patch-oss_ctl__oss.c index e7e38139f7d9..0e103a7fa1d8 100644 --- a/audio/alsa-plugins/files/patch-oss-ctl_oss.c +++ b/audio/alsa-plugins/files/patch-oss_ctl__oss.c @@ -1,4 +1,4 @@ ---- oss/ctl_oss.c.orig 2008-10-29 08:42:13.000000000 -0400 +--- oss/ctl_oss.c.orig 2016-07-26 13:27:23 UTC +++ oss/ctl_oss.c @@ -26,7 +26,11 @@ #include diff --git a/audio/alsa-plugins/files/patch-oss-pcm_oss.c b/audio/alsa-plugins/files/patch-oss_pcm__oss.c similarity index 62% rename from audio/alsa-plugins/files/patch-oss-pcm_oss.c rename to audio/alsa-plugins/files/patch-oss_pcm__oss.c index 98de34bb8d74..79966ae29fb8 100644 --- a/audio/alsa-plugins/files/patch-oss-pcm_oss.c +++ b/audio/alsa-plugins/files/patch-oss_pcm__oss.c @@ -1,6 +1,6 @@ ---- oss/pcm_oss.c.orig 2008-10-29 08:42:13.000000000 -0400 +--- oss/pcm_oss.c.orig 2016-07-26 13:27:23 UTC +++ oss/pcm_oss.c -@@ -22,4 +22,8 @@ +@@ -22,7 +22,11 @@ #include #include #include @@ -9,8 +9,11 @@ +#else +#include +#endif -@@ -116,7 +120,7 @@ static int oss_drain(snd_pcm_ioplug_t *i - snd_pcm_oss_t *oss = io->private_data; + + #define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) + +@@ -258,7 +262,7 @@ static int oss_drain(snd_pcm_ioplug_t *i + #endif if (io->stream == SND_PCM_STREAM_PLAYBACK) - ioctl(oss->fd, SNDCTL_DSP_SYNC); @@ -18,9 +21,9 @@ return 0; } -@@ -125,7 +129,7 @@ static int oss_prepare(snd_pcm_ioplug_t - snd_pcm_oss_t *oss = io->private_data; - int tmp; +@@ -272,7 +276,7 @@ static int oss_prepare(snd_pcm_ioplug_t + fprintf(stderr, "%s()\n", __func__); + #endif - ioctl(oss->fd, SNDCTL_DSP_RESET); + ioctl(oss->fd, SNDCTL_DSP_RESET, NULL); diff --git a/audio/alsa-plugins/files/patch-usb_stream-pcm_usb_stream.c b/audio/alsa-plugins/files/patch-usb__stream_pcm__usb__stream.c similarity index 96% rename from audio/alsa-plugins/files/patch-usb_stream-pcm_usb_stream.c rename to audio/alsa-plugins/files/patch-usb__stream_pcm__usb__stream.c index 5dd11f5555ce..89923343718c 100644 --- a/audio/alsa-plugins/files/patch-usb_stream-pcm_usb_stream.c +++ b/audio/alsa-plugins/files/patch-usb__stream_pcm__usb__stream.c @@ -1,8 +1,8 @@ based on https://github.com/dankamongmen/libdank/blob/master/libdank/compat-FreeBSD.c ---- usb_stream/pcm_usb_stream.c.orig +--- usb_stream/pcm_usb_stream.c.orig 2016-03-31 13:11:29 UTC +++ usb_stream/pcm_usb_stream.c -@@ -79,6 +81,69 @@ typedef struct { +@@ -79,6 +79,69 @@ typedef struct { static struct user_usb_stream *uus; static pthread_mutex_t uus_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -72,7 +72,7 @@ based on https://github.com/dankamongmen/libdank/blob/master/libdank/compat-Free static struct user_usb_stream *get_uus(const char *card) { pthread_mutex_lock(&uus_mutex); -@@ -219,7 +284,11 @@ static int snd_pcm_us_prepare(snd_pcm_io +@@ -219,7 +282,11 @@ static int snd_pcm_us_prepare(snd_pcm_io } diff --git a/audio/alsa-utils/files/patch-alsaloop__alsaloop.c b/audio/alsa-utils/files/patch-alsaloop_alsaloop.c similarity index 74% rename from audio/alsa-utils/files/patch-alsaloop__alsaloop.c rename to audio/alsa-utils/files/patch-alsaloop_alsaloop.c index 22b0102aecb5..f3a9c4d7e908 100644 --- a/audio/alsa-utils/files/patch-alsaloop__alsaloop.c +++ b/audio/alsa-utils/files/patch-alsaloop_alsaloop.c @@ -1,6 +1,6 @@ ---- alsaloop/alsaloop.c~ +--- alsaloop/alsaloop.c.orig 2016-03-31 14:37:02 UTC +++ alsaloop/alsaloop.c -@@ -760,7 +761,11 @@ static void thread_job1(void *_data) +@@ -760,7 +760,11 @@ static void thread_job1(void *_data) snd_output_printf(output, "pool took %lius\n", timediff(tv2, tv1)); } if (err < 0) { diff --git a/audio/alsa-utils/files/patch-alsamixer__mixer_display.c b/audio/alsa-utils/files/patch-alsamixer_mixer__display.c similarity index 81% rename from audio/alsa-utils/files/patch-alsamixer__mixer_display.c rename to audio/alsa-utils/files/patch-alsamixer_mixer__display.c index f3c645dcbf90..328182419f96 100644 --- a/audio/alsa-utils/files/patch-alsamixer__mixer_display.c +++ b/audio/alsa-utils/files/patch-alsamixer_mixer__display.c @@ -1,4 +1,4 @@ ---- alsamixer/mixer_display.c~ +--- alsamixer/mixer_display.c.orig 2016-03-31 14:37:02 UTC +++ alsamixer/mixer_display.c @@ -17,7 +17,9 @@ * along with this program. If not, see . diff --git a/audio/alsa-utils/files/patch-alsamixer__volume_mapping.c b/audio/alsa-utils/files/patch-alsamixer_volume__mapping.c similarity index 81% rename from audio/alsa-utils/files/patch-alsamixer__volume_mapping.c rename to audio/alsa-utils/files/patch-alsamixer_volume__mapping.c index ba1dd03ad509..34cc3e0973a2 100644 --- a/audio/alsa-utils/files/patch-alsamixer__volume_mapping.c +++ b/audio/alsa-utils/files/patch-alsamixer_volume__mapping.c @@ -1,4 +1,4 @@ ---- alsamixer/volume_mapping.c~ +--- alsamixer/volume_mapping.c.orig 2016-03-31 14:37:02 UTC +++ alsamixer/volume_mapping.c @@ -37,7 +37,7 @@ #include diff --git a/audio/alsa-utils/files/patch-aplay__aplay.c b/audio/alsa-utils/files/patch-aplay_aplay.c similarity index 90% rename from audio/alsa-utils/files/patch-aplay__aplay.c rename to audio/alsa-utils/files/patch-aplay_aplay.c index 3cccaaa39c45..f50a227535d9 100644 --- a/audio/alsa-utils/files/patch-aplay__aplay.c +++ b/audio/alsa-utils/files/patch-aplay_aplay.c @@ -1,4 +1,4 @@ ---- aplay/aplay.c~ +--- aplay/aplay.c.orig 2016-03-31 14:37:02 UTC +++ aplay/aplay.c @@ -48,7 +48,6 @@ #include diff --git a/audio/alsa-utils/files/patch-aplay__formats.h b/audio/alsa-utils/files/patch-aplay_formats.h similarity index 76% rename from audio/alsa-utils/files/patch-aplay__formats.h rename to audio/alsa-utils/files/patch-aplay_formats.h index 56309d22103f..fa232b58bf42 100644 --- a/audio/alsa-utils/files/patch-aplay__formats.h +++ b/audio/alsa-utils/files/patch-aplay_formats.h @@ -1,4 +1,4 @@ ---- aplay/formats.h~ +--- aplay/formats.h.orig 2016-03-31 14:37:02 UTC +++ aplay/formats.h @@ -1,7 +1,6 @@ #ifndef FORMATS_H diff --git a/audio/alure/files/patch-src__codec_fluidsynth.cpp b/audio/alure/files/patch-src__codec_fluidsynth.cpp deleted file mode 100644 index 145415b2781a..000000000000 --- a/audio/alure/files/patch-src__codec_fluidsynth.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- ./src/codec_fluidsynth.cpp.orig 2011-07-29 10:37:48.000000000 +0200 -+++ ./src/codec_fluidsynth.cpp 2014-01-22 01:32:03.000000000 +0100 -@@ -27,6 +27,7 @@ - - #include - #include -+#include - #ifdef _WIN32 - #include - #endif diff --git a/audio/alure/files/patch-src_codec__fluidsynth.cpp b/audio/alure/files/patch-src_codec__fluidsynth.cpp new file mode 100644 index 000000000000..c1002f6bd646 --- /dev/null +++ b/audio/alure/files/patch-src_codec__fluidsynth.cpp @@ -0,0 +1,10 @@ +--- src/codec_fluidsynth.cpp.orig 2011-07-29 08:37:48 UTC ++++ src/codec_fluidsynth.cpp +@@ -27,6 +27,7 @@ + + #include + #include ++#include + #ifdef _WIN32 + #include + #endif diff --git a/audio/amarok-kde4/files/patch-src__core-impl__playlists__types__file__xspf__XSPFPlaylist.cpp b/audio/amarok-kde4/files/patch-src_core-impl_playlists_types_file_xspf_XSPFPlaylist.cpp similarity index 82% rename from audio/amarok-kde4/files/patch-src__core-impl__playlists__types__file__xspf__XSPFPlaylist.cpp rename to audio/amarok-kde4/files/patch-src_core-impl_playlists_types_file_xspf_XSPFPlaylist.cpp index b3164aab531b..e0cf9d2a7cab 100644 --- a/audio/amarok-kde4/files/patch-src__core-impl__playlists__types__file__xspf__XSPFPlaylist.cpp +++ b/audio/amarok-kde4/files/patch-src_core-impl_playlists_types_file_xspf_XSPFPlaylist.cpp @@ -1,5 +1,5 @@ ---- src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp.orig 2014-07-27 18:29:25.000000000 +0200 -+++ src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp 2014-07-27 18:29:43.000000000 +0200 +--- src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp.orig 2013-08-14 20:22:52 UTC ++++ src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp @@ -27,6 +27,7 @@ #include "playlist/PlaylistController.h" #include "playlist/PlaylistModelStack.h" @@ -8,7 +8,7 @@ using namespace Playlists; XSPFPlaylist::XSPFPlaylist( const KUrl &url, Playlists::PlaylistProvider *provider, OnLoadAction onLoad ) -@@ -101,7 +102,7 @@ +@@ -101,7 +102,7 @@ XSPFPlaylist::load() //FIXME: this needs to be moved to whatever is creating the XSPFPlaylist if( m_autoAppendAfterLoad ) The::playlistController()->insertPlaylist( diff --git a/audio/amarok-kde4/files/patch-src__musicbrainz__MusicDNSAudioDecoder.cpp b/audio/amarok-kde4/files/patch-src_musicbrainz_MusicDNSAudioDecoder.cpp similarity index 80% rename from audio/amarok-kde4/files/patch-src__musicbrainz__MusicDNSAudioDecoder.cpp rename to audio/amarok-kde4/files/patch-src_musicbrainz_MusicDNSAudioDecoder.cpp index 047cf89654cd..7e84d1dcce0b 100644 --- a/audio/amarok-kde4/files/patch-src__musicbrainz__MusicDNSAudioDecoder.cpp +++ b/audio/amarok-kde4/files/patch-src_musicbrainz_MusicDNSAudioDecoder.cpp @@ -6,8 +6,8 @@ If this is not defined, libavutil/common.h fails because of this check: Not submitted upstream, as newer releases build with -std=c++0x, which always sets __STD_CONSTANT_MACROS by default. ---- src/musicbrainz/MusicDNSAudioDecoder.cpp.orig 2014-07-21 16:48:11.000000000 +0300 -+++ src/musicbrainz/MusicDNSAudioDecoder.cpp 2014-07-21 16:49:04.000000000 +0300 +--- src/musicbrainz/MusicDNSAudioDecoder.cpp.orig 2013-08-14 20:22:52 UTC ++++ src/musicbrainz/MusicDNSAudioDecoder.cpp @@ -14,6 +14,8 @@ * this program. If not, see . * ****************************************************************************************/ diff --git a/audio/amarok-kde4/files/patch-src__playlist__proxymodels__SortScheme.cpp b/audio/amarok-kde4/files/patch-src_playlist_proxymodels_SortScheme.cpp similarity index 60% rename from audio/amarok-kde4/files/patch-src__playlist__proxymodels__SortScheme.cpp rename to audio/amarok-kde4/files/patch-src_playlist_proxymodels_SortScheme.cpp index 282afce2f120..31611edd4b3a 100644 --- a/audio/amarok-kde4/files/patch-src__playlist__proxymodels__SortScheme.cpp +++ b/audio/amarok-kde4/files/patch-src_playlist_proxymodels_SortScheme.cpp @@ -1,6 +1,6 @@ ---- src/playlist/proxymodels/SortScheme.cpp.orig 2014-07-27 18:27:06.000000000 +0200 -+++ src/playlist/proxymodels/SortScheme.cpp 2014-07-27 18:27:44.000000000 +0200 -@@ -123,13 +123,13 @@ +--- src/playlist/proxymodels/SortScheme.cpp.orig 2013-08-14 20:22:52 UTC ++++ src/playlist/proxymodels/SortScheme.cpp +@@ -123,13 +123,13 @@ SortScheme::trimToLevel( int lastLevel ) SortScheme::const_iterator SortScheme::begin() const { diff --git a/audio/amp/files/patch-audio.c b/audio/amp/files/patch-audio.c index ba8aed625001..660fc47bcb3c 100644 --- a/audio/amp/files/patch-audio.c +++ b/audio/amp/files/patch-audio.c @@ -1,6 +1,6 @@ ---- audio.c Sat Aug 23 08:30:21 1997 -+++ audio.c Wed Apr 13 00:22:25 2005 -@@ -56,7 +56,7 @@ +--- audio.c.orig 1997-08-23 11:30:21 UTC ++++ audio.c +@@ -56,7 +56,7 @@ void statusDisplay(struct AUDIO_HEADER * msg("{ %d } ",frameNo); } if (A_SHOW_TIME && !(frameNo%10)) { @@ -9,7 +9,7 @@ minutes=seconds/60; seconds=seconds % 60; msg("[%d:%02d]",minutes,seconds); -@@ -245,10 +245,6 @@ +@@ -245,10 +245,6 @@ void report_header_error(int err) switch (err) { case GETHDR_ERR: die("error reading mpeg bitstream. exiting.\n"); break; @@ -20,7 +20,7 @@ case GETHDR_FL1: warn("ISO/MPEG layer 1 is not supported by amp (yet).\n"); break; case GETHDR_FF : warn("free format bitstreams are not supported. sorry.\n"); -@@ -268,10 +264,10 @@ +@@ -268,10 +264,10 @@ int setup_audio(struct AUDIO_HEADER *hea { if (A_AUDIO_PLAY) if (AUDIO_BUFFER_SIZE==0) diff --git a/audio/amp/files/patch-audio.h b/audio/amp/files/patch-audio.h index 88940fd95be2..e21d86cdf946 100644 --- a/audio/amp/files/patch-audio.h +++ b/audio/amp/files/patch-audio.h @@ -1,5 +1,5 @@ ---- audio.h Thu Aug 21 10:00:18 1997 -+++ audio.h Wed Apr 13 00:21:47 2005 +--- audio.h.orig 1997-08-21 13:00:18 UTC ++++ audio.h @@ -9,6 +9,7 @@ #include @@ -8,7 +8,7 @@ int ID; int layer; int protection_bit; -@@ -55,8 +56,8 @@ +@@ -55,8 +56,8 @@ extern void report_header_error(int err) extern int scalefac_l[2][2][22]; extern int scalefac_s[2][2][13][3]; @@ -19,7 +19,7 @@ extern short t_bitrate[2][3][15]; extern int is[2][578]; -@@ -64,7 +65,7 @@ +@@ -64,7 +65,7 @@ extern float xr[2][32][18]; extern int *t_l,*t_s; extern int nch; @@ -28,7 +28,7 @@ extern int A_QUIET,A_SHOW_CNT,A_FORMAT_WAVE,A_DUMP_BINARY; extern int A_WRITE_TO_AUDIO,A_WRITE_TO_FILE; -@@ -106,9 +107,14 @@ +@@ -106,9 +107,14 @@ float xr[2][32][18]; int *t_l,*t_s; int nch; @@ -46,7 +46,7 @@ }; /* GUI control stuff */ -@@ -143,28 +149,47 @@ +@@ -143,28 +149,47 @@ short t_bitrate[2][3][15] = {{ /* the last sfb is given implicitly on pg.28. of the standard. scalefactors * for that one are 0, pretab also */ diff --git a/audio/amp/files/patch-audioIO_Linux.c b/audio/amp/files/patch-audioIO__Linux.c similarity index 81% rename from audio/amp/files/patch-audioIO_Linux.c rename to audio/amp/files/patch-audioIO__Linux.c index b5d69bf22062..a11446effe43 100644 --- a/audio/amp/files/patch-audioIO_Linux.c +++ b/audio/amp/files/patch-audioIO__Linux.c @@ -1,5 +1,5 @@ ---- audioIO_Linux.c.orig Sat May 31 10:47:58 1997 -+++ audioIO_Linux.c Fri Aug 23 14:46:27 2002 +--- audioIO_Linux.c.orig 1997-05-31 17:47:58 UTC ++++ audioIO_Linux.c @@ -21,12 +21,14 @@ #ifdef HAVE_MACHINE_SOUNDCARD_H #include @@ -16,7 +16,7 @@ /* declare these static to effectively isolate the audio device */ -@@ -42,6 +44,9 @@ +@@ -42,6 +44,9 @@ static int volumeIoctl; void audioOpen(int frequency, int stereo, int volume) { @@ -26,7 +26,7 @@ int supportedMixers, play_format=AFMT_S16_LE; if ((audio_fd = open ("/dev/dsp", O_WRONLY, 0)) == -1) -@@ -78,7 +83,12 @@ +@@ -78,7 +83,12 @@ audioOpen(int frequency, int stereo, int if (volume != -1) audioSetVolume(volume); diff --git a/audio/amp/files/patch-dump.c b/audio/amp/files/patch-dump.c index efefaa8c74be..2cb924ef1944 100644 --- a/audio/amp/files/patch-dump.c +++ b/audio/amp/files/patch-dump.c @@ -1,6 +1,6 @@ ---- dump.c Sat May 31 17:19:38 1997 -+++ dump.c Wed Apr 13 00:21:47 2005 -@@ -46,19 +46,21 @@ +--- dump.c.orig 1997-05-31 20:19:38 UTC ++++ dump.c +@@ -46,19 +46,21 @@ int _data,space=0; void show_header(struct AUDIO_HEADER *header) { int bitrate=t_bitrate[header->ID][3-header->layer][header->bitrate_index]; diff --git a/audio/amp/files/patch-formats.c b/audio/amp/files/patch-formats.c index 24028dceee75..57f6ddb0a4cc 100644 --- a/audio/amp/files/patch-formats.c +++ b/audio/amp/files/patch-formats.c @@ -1,6 +1,6 @@ ---- formats.c Sat May 31 14:47:58 1997 -+++ formats.c Wed Apr 13 00:21:47 2005 -@@ -27,7 +27,7 @@ +--- formats.c.orig 1997-05-31 17:47:58 UTC ++++ formats.c +@@ -27,7 +27,7 @@ unsigned char iza[8]={0x64 ,0x61 ,0x74 , int len,fs,i; len=ftell(out_file)-44; diff --git a/audio/amp/files/patch-getbits.c b/audio/amp/files/patch-getbits.c index 65a78b07e73b..f1e28c2e0853 100644 --- a/audio/amp/files/patch-getbits.c +++ b/audio/amp/files/patch-getbits.c @@ -1,6 +1,6 @@ ---- getbits.c Wed Aug 20 10:30:21 1997 -+++ getbits.c Wed Apr 13 00:21:47 2005 -@@ -91,6 +91,7 @@ +--- getbits.c.orig 1997-08-20 13:30:21 UTC ++++ getbits.c +@@ -91,6 +91,7 @@ unsigned int getbits(int n) */ static inline void parse_header(struct AUDIO_HEADER *header) { @@ -8,7 +8,7 @@ header->ID=_getbits(1); header->layer=_getbits(2); header->protection_bit=_getbits(1); -@@ -112,11 +113,17 @@ +@@ -112,11 +113,17 @@ static inline int header_sanity_check(st header->bitrate_index==15 || header->sampling_frequency==3) return -1; @@ -26,7 +26,7 @@ return 0; } -@@ -132,11 +139,7 @@ +@@ -132,11 +139,7 @@ struct AUDIO_HEADER tmp; if ((retval=_fillbfr(4))!=0) return retval; for(;;) { diff --git a/audio/amp/files/patch-guicontrol.c b/audio/amp/files/patch-guicontrol.c index c493c4297ca1..b32c284fb929 100644 --- a/audio/amp/files/patch-guicontrol.c +++ b/audio/amp/files/patch-guicontrol.c @@ -1,6 +1,6 @@ ---- guicontrol.c.orig Fri Aug 6 17:54:38 2004 -+++ guicontrol.c Fri Aug 6 17:55:44 2004 -@@ -375,7 +375,8 @@ +--- guicontrol.c.orig 1997-08-23 11:30:51 UTC ++++ guicontrol.c +@@ -375,7 +375,8 @@ int decodeMPEG_2(int inFilefd) break; case GETHDR_SYN: warn("oops, we're out of sync.\n"); break; diff --git a/audio/amp/files/patch-layer2.c b/audio/amp/files/patch-layer2.c index 98d27660e6f2..a127aaf76529 100644 --- a/audio/amp/files/patch-layer2.c +++ b/audio/amp/files/patch-layer2.c @@ -1,6 +1,6 @@ ---- layer2.c Mon Jun 16 14:53:15 1997 -+++ layer2.c Wed Apr 13 00:21:47 2005 -@@ -34,7 +34,7 @@ +--- layer2.c.orig 1997-06-16 17:53:15 UTC ++++ layer2.c +@@ -34,7 +34,7 @@ int hsize,fs,mean_frame_size; if (header->protection_bit==0) hsize+=2; bitrate=t_bitrate[header->ID][3-header->layer][header->bitrate_index]; diff --git a/audio/amp/files/patch-layer3.c b/audio/amp/files/patch-layer3.c index 29291ac4f8c0..e00700b24df4 100644 --- a/audio/amp/files/patch-layer3.c +++ b/audio/amp/files/patch-layer3.c @@ -1,6 +1,6 @@ ---- layer3.c Mon Aug 18 09:42:17 1997 -+++ layer3.c Wed Apr 13 00:21:47 2005 -@@ -61,7 +61,7 @@ +--- layer3.c.orig 1997-08-18 12:42:17 UTC ++++ layer3.c +@@ -61,7 +61,7 @@ int mean_frame_size,bitrate,fs,hsize,ssi /* MPEG2 only has one granule */ bitrate=t_bitrate[header->ID][3-header->layer][header->bitrate_index]; @@ -9,7 +9,7 @@ if (header->ID) mean_frame_size=144000*bitrate/fs; else mean_frame_size=72000*bitrate/fs; -@@ -96,8 +96,8 @@ +@@ -96,8 +96,8 @@ int mean_frame_size,bitrate,fs,hsize,ssi /* these two should go away */ diff --git a/audio/amp/files/patch-position.c b/audio/amp/files/patch-position.c index 2d6a169401fc..8c446f7e38ff 100644 --- a/audio/amp/files/patch-position.c +++ b/audio/amp/files/patch-position.c @@ -1,6 +1,6 @@ ---- position.c Sat May 31 14:47:58 1997 -+++ position.c Wed Apr 13 00:21:47 2005 -@@ -40,7 +40,7 @@ +--- position.c.orig 1997-05-31 17:47:58 UTC ++++ position.c +@@ -40,7 +40,7 @@ struct AUDIO_HEADER tmp; } bitrate=t_bitrate[tmp.ID][3-tmp.layer][tmp.bitrate_index]; @@ -9,7 +9,7 @@ if (tmp.ID) mean_frame_size=144000*bitrate/fs; else mean_frame_size=72000*bitrate/fs; fillbfr(mean_frame_size + tmp.padding_bit - hsize); -@@ -73,7 +73,7 @@ +@@ -73,7 +73,7 @@ struct AUDIO_HEADER tmp; * so we have to go back one frame + 4 bytes + 1 byte (in case padding was used). */ bitrate=t_bitrate[tmp.ID][3-tmp.layer][tmp.bitrate_index]; diff --git a/audio/amp/files/patch-rtbuf.c b/audio/amp/files/patch-rtbuf.c index b9285dbb42c4..2700b2f62feb 100644 --- a/audio/amp/files/patch-rtbuf.c +++ b/audio/amp/files/patch-rtbuf.c @@ -1,6 +1,6 @@ ---- rtbuf.c Sat Aug 23 07:16:40 1997 -+++ rtbuf.c Wed Apr 13 00:21:47 2005 -@@ -337,15 +337,15 @@ +--- rtbuf.c.orig 1997-08-23 10:16:40 UTC ++++ rtbuf.c +@@ -337,15 +337,15 @@ int apar; (mpegheader->mode != 3) ? "stereo" : "mono"); return -1; } diff --git a/audio/ample/files/patch-src__base64.c b/audio/ample/files/patch-src_base64.c similarity index 68% rename from audio/ample/files/patch-src__base64.c rename to audio/ample/files/patch-src_base64.c index 23e6d10f7f2b..ede078f12584 100644 --- a/audio/ample/files/patch-src__base64.c +++ b/audio/ample/files/patch-src_base64.c @@ -1,5 +1,5 @@ ---- src/base64.c.orig Tue Nov 25 18:28:56 2003 -+++ src/base64.c Sat Jul 3 22:38:53 2004 +--- src/base64.c.orig 2003-11-25 09:28:56 UTC ++++ src/base64.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/audio/aqualung/files/patch-ffmpeg3 b/audio/aqualung/files/patch-ffmpeg3 index f734c21d5b9b..225b6e2e5841 100644 --- a/audio/aqualung/files/patch-ffmpeg3 +++ b/audio/aqualung/files/patch-ffmpeg3 @@ -7,9 +7,9 @@ With FFmpeg 1.0 and libav 10, AVCodecContext.{get,release}_buffer() were deprecated; the new default AVCodecContext.get_buffer2() implementation works fine for us. ---- src/decoder/dec_lavc.c.orig +--- src/decoder/dec_lavc.c.orig 2015-04-19 12:49:49 UTC +++ src/decoder/dec_lavc.c -@@ -280,10 +280,12 @@ lavc_decoder_open(decoder_t * dec, char * filename) { +@@ -280,10 +280,12 @@ lavc_decoder_open(decoder_t * dec, char return DECODER_OPEN_BADLIB; pd->avCodecCtx = pd->avFormatCtx->streams[pd->audioStream]->codec; diff --git a/audio/aqualung/files/patch-src__decoder__dec_mac.cpp b/audio/aqualung/files/patch-src_decoder_dec__mac.cpp similarity index 100% rename from audio/aqualung/files/patch-src__decoder__dec_mac.cpp rename to audio/aqualung/files/patch-src_decoder_dec__mac.cpp diff --git a/audio/ario/files/patch-src_ario-avahi.c b/audio/ario/files/patch-src_ario-avahi.c index 7e72c30dd214..d1619e199685 100644 --- a/audio/ario/files/patch-src_ario-avahi.c +++ b/audio/ario/files/patch-src_ario-avahi.c @@ -1,5 +1,5 @@ ---- src/ario-avahi.c.orig 2011-07-18 20:05:50.915461042 +0200 -+++ src/ario-avahi.c 2011-07-18 20:08:56.334574365 +0200 +--- src/ario-avahi.c.orig 2011-02-27 15:07:31 UTC ++++ src/ario-avahi.c @@ -34,6 +34,11 @@ #include #include "ario-debug.h" diff --git a/audio/ascd/files/patch-Imakefile b/audio/ascd/files/patch-Imakefile index 697bbe83009c..81b8b951c023 100644 --- a/audio/ascd/files/patch-Imakefile +++ b/audio/ascd/files/patch-Imakefile @@ -1,6 +1,6 @@ ---- Imakefile.orig Sun Sep 5 08:24:23 1999 -+++ Imakefile Wed Aug 2 04:41:16 2000 -@@ -5,11 +5,10 @@ +--- Imakefile.orig 1999-09-04 23:24:23 UTC ++++ Imakefile +@@ -5,11 +5,10 @@ NAME = ascd BINDIR = CBINDIR MANDIR = CMANDIR THEMESDIR = CTHDIR diff --git a/audio/ascd/files/patch-faktory.c b/audio/ascd/files/patch-faktory.c index 5ced3c75f1ba..a6802228bc89 100644 --- a/audio/ascd/files/patch-faktory.c +++ b/audio/ascd/files/patch-faktory.c @@ -1,6 +1,6 @@ ---- /usr/ports/audio/ascd/work/ascd-0.13.2/faktory.c Mon Jul 5 20:52:38 1999 -+++ faktory.c Sat Sep 2 17:26:31 2000 -@@ -58,9 +58,9 @@ +--- faktory.c.orig 1999-07-05 16:52:38 UTC ++++ faktory.c +@@ -58,9 +58,9 @@ int fak_parse_line(char *ligne, char *ke unsigned int pos = 0; if ((strlen(ligne) > 0) && (ligne[0] != '#')) { diff --git a/audio/ascd/files/patch-misc_config.h.default b/audio/ascd/files/patch-misc_config.h.default index 1825012fba10..da20f0e9aca2 100644 --- a/audio/ascd/files/patch-misc_config.h.default +++ b/audio/ascd/files/patch-misc_config.h.default @@ -1,5 +1,5 @@ ---- misc/config.h.default.orig Sun Aug 8 21:23:05 1999 -+++ misc/config.h.default Sun Aug 8 21:23:38 1999 +--- misc/config.h.default.orig 1999-04-19 17:25:01 UTC ++++ misc/config.h.default @@ -1,5 +1,5 @@ #define PACKAGE "ascd" #define DEFAULT_COLOR "#2FAFAF" diff --git a/audio/ascd/files/patch-misc_dirs.h.default b/audio/ascd/files/patch-misc_dirs.h.default index 9b950f0f898b..3906609f8d32 100644 --- a/audio/ascd/files/patch-misc_dirs.h.default +++ b/audio/ascd/files/patch-misc_dirs.h.default @@ -1,5 +1,5 @@ ---- misc/dirs.h.default.orig Sun Aug 8 21:23:13 1999 -+++ misc/dirs.h.default Sun Aug 8 21:23:56 1999 +--- misc/dirs.h.default.orig 1999-04-19 17:24:12 UTC ++++ misc/dirs.h.default @@ -1,3 +1,3 @@ -#define CBINDIR /usr/local/bin -#define CMANDIR /usr/local/man/man1 diff --git a/audio/asunder/files/patch-Makefile.in b/audio/asunder/files/patch-Makefile.in index 434d994f3c40..b1e6df5f809b 100644 --- a/audio/asunder/files/patch-Makefile.in +++ b/audio/asunder/files/patch-Makefile.in @@ -1,4 +1,4 @@ ---- Makefile.in.orig 2015-01-25 20:25:32 UTC +--- Makefile.in.orig 2015-10-03 03:58:31 UTC +++ Makefile.in @@ -345,7 +345,7 @@ top_srcdir = @top_srcdir@ SUBDIRS = src po diff --git a/audio/audacity/files/patch-Makefile.am b/audio/audacity/files/patch-Makefile.am index 1d553f2f247e..0951bda793ab 100644 --- a/audio/audacity/files/patch-Makefile.am +++ b/audio/audacity/files/patch-Makefile.am @@ -1,4 +1,4 @@ ---- Makefile.am.orig 2016-01-08 22:05:48 UTC +--- Makefile.am.orig 2016-07-26 13:34:06 UTC +++ Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = help images lib-src po src tests diff --git a/audio/audacity/files/patch-configure.ac b/audio/audacity/files/patch-configure.ac index 5e6a139c605e..0cb6765baa6a 100644 --- a/audio/audacity/files/patch-configure.ac +++ b/audio/audacity/files/patch-configure.ac @@ -8,7 +8,7 @@ AM_GNU_GETTEXT_VERSION([0.18]) AM_GNU_GETTEXT([external]) -@@ -690,6 +690,7 @@ AC_CONFIG_FILES([ +@@ -690,6 +691,7 @@ AC_CONFIG_FILES([ Makefile help/Makefile images/Makefile diff --git a/audio/audacity/files/patch-include_Makefile.am b/audio/audacity/files/patch-include_Makefile.am index c92306752c82..55f3706b13d9 100644 --- a/audio/audacity/files/patch-include_Makefile.am +++ b/audio/audacity/files/patch-include_Makefile.am @@ -1,4 +1,4 @@ ---- include/Makefile.am.orig 1970-01-01 00:00:00 UTC +--- include/Makefile.am.orig 2016-07-26 13:34:07 UTC +++ include/Makefile.am @@ -0,0 +1,21 @@ +ACLOCAL_AMFLAGS= -I m4 diff --git a/audio/audacity/files/patch-lib-src_FileDialog_Makefile.am b/audio/audacity/files/patch-lib-src_FileDialog_Makefile.am index 8452d4495d89..da4d87cdd8b1 100644 --- a/audio/audacity/files/patch-lib-src_FileDialog_Makefile.am +++ b/audio/audacity/files/patch-lib-src_FileDialog_Makefile.am @@ -1,4 +1,4 @@ ---- lib-src/FileDialog/Makefile.am.orig 2016-01-08 22:05:48 UTC +--- lib-src/FileDialog/Makefile.am.orig 2016-07-26 13:34:06 UTC +++ lib-src/FileDialog/Makefile.am @@ -1,5 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 diff --git a/audio/audacity/files/patch-lib-src_FileDialog_gtk_Makefile.am b/audio/audacity/files/patch-lib-src_FileDialog_gtk_Makefile.am index 54040c9fa7b6..261808af58a3 100644 --- a/audio/audacity/files/patch-lib-src_FileDialog_gtk_Makefile.am +++ b/audio/audacity/files/patch-lib-src_FileDialog_gtk_Makefile.am @@ -1,4 +1,4 @@ ---- lib-src/FileDialog/gtk/Makefile.am.orig 1970-01-01 00:00:00 UTC +--- lib-src/FileDialog/gtk/Makefile.am.orig 2016-07-26 13:34:07 UTC +++ lib-src/FileDialog/gtk/Makefile.am @@ -0,0 +1,12 @@ +ACLOCAL_AMFLAGS= -I m4 diff --git a/audio/audacity/files/patch-lib-src_FileDialog_mac_Makefile.am b/audio/audacity/files/patch-lib-src_FileDialog_mac_Makefile.am index 712c78c23a0b..614725768b87 100644 --- a/audio/audacity/files/patch-lib-src_FileDialog_mac_Makefile.am +++ b/audio/audacity/files/patch-lib-src_FileDialog_mac_Makefile.am @@ -1,4 +1,4 @@ ---- lib-src/FileDialog/mac/Makefile.am.orig 1970-01-01 00:00:00 UTC +--- lib-src/FileDialog/mac/Makefile.am.orig 2016-07-26 13:34:07 UTC +++ lib-src/FileDialog/mac/Makefile.am @@ -0,0 +1,10 @@ +ACLOCAL_AMFLAGS= -I m4 diff --git a/audio/audacity/files/patch-lib-src_FileDialog_win_Makefile.am b/audio/audacity/files/patch-lib-src_FileDialog_win_Makefile.am index c9757b902435..e32b8b741c66 100644 --- a/audio/audacity/files/patch-lib-src_FileDialog_win_Makefile.am +++ b/audio/audacity/files/patch-lib-src_FileDialog_win_Makefile.am @@ -1,4 +1,4 @@ ---- lib-src/FileDialog/win/Makefile.am.orig 1970-01-01 00:00:00 UTC +--- lib-src/FileDialog/win/Makefile.am.orig 2016-07-26 13:34:07 UTC +++ lib-src/FileDialog/win/Makefile.am @@ -0,0 +1,10 @@ +ACLOCAL_AMFLAGS= -I m4 diff --git a/audio/audacity/files/patch-lib-src_libnyquist_Makefile.am b/audio/audacity/files/patch-lib-src_libnyquist_Makefile.am index 2e9e996a0e4b..82409cb37fbb 100644 --- a/audio/audacity/files/patch-lib-src_libnyquist_Makefile.am +++ b/audio/audacity/files/patch-lib-src_libnyquist_Makefile.am @@ -1,4 +1,4 @@ ---- lib-src/libnyquist/Makefile.am.orig 2016-01-08 22:05:48 UTC +--- lib-src/libnyquist/Makefile.am.orig 2016-07-26 13:34:06 UTC +++ lib-src/libnyquist/Makefile.am @@ -3,7 +3,7 @@ # Written by Richard Ash following Gary Vaughan's Autobook diff --git a/audio/audacity/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h b/audio/audacity/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h index 9456e1a74263..ff74e0d6f488 100644 --- a/audio/audacity/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h +++ b/audio/audacity/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h @@ -1,4 +1,4 @@ ---- lib-src/libnyquist/nyquist/cmt/cext.h.orig 2015-07-11 10:02:22 UTC +--- lib-src/libnyquist/nyquist/cmt/cext.h.orig 2016-07-26 13:34:07 UTC +++ lib-src/libnyquist/nyquist/cmt/cext.h @@ -58,7 +58,7 @@ EXIT(n) -- calls exit(n) after shutting #include diff --git a/audio/audacity/files/patch-lib-src_libnyquist_nyquist_nyqsrc_sound.h b/audio/audacity/files/patch-lib-src_libnyquist_nyquist_nyqsrc_sound.h index ea13f2a06b99..ee47829b6d86 100644 --- a/audio/audacity/files/patch-lib-src_libnyquist_nyquist_nyqsrc_sound.h +++ b/audio/audacity/files/patch-lib-src_libnyquist_nyquist_nyqsrc_sound.h @@ -1,4 +1,4 @@ ---- lib-src/libnyquist/nyquist/nyqsrc/sound.h.orig 2016-01-08 22:05:48 UTC +--- lib-src/libnyquist/nyquist/nyqsrc/sound.h.orig 2016-07-26 13:34:06 UTC +++ lib-src/libnyquist/nyquist/nyqsrc/sound.h @@ -459,7 +459,7 @@ double step_to_hz(double); diff --git a/audio/audacity/files/patch-lib-src__libnyquist__nyquist__nyqstk__include__FileRead.h b/audio/audacity/files/patch-lib-src_libnyquist_nyquist_nyqstk_include_FileRead.h similarity index 91% rename from audio/audacity/files/patch-lib-src__libnyquist__nyquist__nyqstk__include__FileRead.h rename to audio/audacity/files/patch-lib-src_libnyquist_nyquist_nyqstk_include_FileRead.h index a706d562532e..fb9932cd3c0c 100644 --- a/audio/audacity/files/patch-lib-src__libnyquist__nyquist__nyqstk__include__FileRead.h +++ b/audio/audacity/files/patch-lib-src_libnyquist_nyquist_nyqstk_include_FileRead.h @@ -1,4 +1,4 @@ ---- lib-src/libnyquist/nyquist/nyqstk/include/FileRead.h.orig 2015-07-11 10:02:22 UTC +--- lib-src/libnyquist/nyquist/nyqstk/include/FileRead.h.orig 2016-07-26 13:34:06 UTC +++ lib-src/libnyquist/nyquist/nyqstk/include/FileRead.h @@ -33,6 +33,7 @@ #define STK_FILEREAD_H diff --git a/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h b/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h index 50b6e3109398..0330f64279e1 100644 --- a/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h +++ b/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h @@ -1,4 +1,4 @@ ---- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig 2015-07-11 10:02:22 UTC +--- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig 2016-07-26 13:34:06 UTC +++ lib-src/libnyquist/nyquist/xlisp/xlisp.h @@ -153,6 +153,15 @@ extern long ptrtoabs(); #endif diff --git a/audio/audacity/files/patch-lib-src_lv2_configure b/audio/audacity/files/patch-lib-src_lv2_configure index 899f8c49567f..39849fe28084 100644 --- a/audio/audacity/files/patch-lib-src_lv2_configure +++ b/audio/audacity/files/patch-lib-src_lv2_configure @@ -1,6 +1,6 @@ ---- lib-src/lv2/configure 2016-01-08 14:05:48.000000000 -0800 -+++ lib-src/lv2/configure 2016-01-27 17:18:31.280753000 -0800 -@@ -54,7 +54,7 @@ +--- lib-src/lv2/configure.orig 2016-01-08 22:05:48 UTC ++++ lib-src/lv2/configure +@@ -54,7 +54,7 @@ includedir=. Name: ${pkg} Version: ${version} Description: Temporary fake config file @@ -8,3 +8,4 @@ +Libs: -L\${libdir} ${lib} -lm Cflags: -I\${includedir}/${pkg}${major} EOF + diff --git a/audio/audacity/files/patch-lib-src_portmixer_include_portmixer.h b/audio/audacity/files/patch-lib-src_portmixer_include_portmixer.h index cccb5444d099..67c7882fe2f5 100644 --- a/audio/audacity/files/patch-lib-src_portmixer_include_portmixer.h +++ b/audio/audacity/files/patch-lib-src_portmixer_include_portmixer.h @@ -1,4 +1,4 @@ ---- lib-src/portmixer/include/portmixer.h.orig 2015-07-11 10:02:22 UTC +--- lib-src/portmixer/include/portmixer.h.orig 2016-07-26 13:34:07 UTC +++ lib-src/portmixer/include/portmixer.h @@ -45,7 +45,7 @@ extern "C" * diff --git a/audio/audacity/files/patch-lib-src_portmixer_src_px__linux__alsa.c b/audio/audacity/files/patch-lib-src_portmixer_src_px__linux__alsa.c index cf697fc92b87..4328601d6fda 100644 --- a/audio/audacity/files/patch-lib-src_portmixer_src_px__linux__alsa.c +++ b/audio/audacity/files/patch-lib-src_portmixer_src_px__linux__alsa.c @@ -1,4 +1,4 @@ ---- lib-src/portmixer/src/px_linux_alsa.c.orig 2016-01-08 22:05:48 UTC +--- lib-src/portmixer/src/px_linux_alsa.c.orig 2016-07-26 13:34:06 UTC +++ lib-src/portmixer/src/px_linux_alsa.c @@ -42,6 +42,7 @@ diff --git a/audio/audacity/files/patch-lib-src__soundtouch__source__SoundTouch__Makefile.am b/audio/audacity/files/patch-lib-src_soundtouch_source_SoundTouch_Makefile.am similarity index 80% rename from audio/audacity/files/patch-lib-src__soundtouch__source__SoundTouch__Makefile.am rename to audio/audacity/files/patch-lib-src_soundtouch_source_SoundTouch_Makefile.am index c974f74c389c..db608ea460bb 100644 --- a/audio/audacity/files/patch-lib-src__soundtouch__source__SoundTouch__Makefile.am +++ b/audio/audacity/files/patch-lib-src_soundtouch_source_SoundTouch_Makefile.am @@ -1,4 +1,4 @@ ---- lib-src/soundtouch/source/SoundTouch/Makefile.am.orig 2015-07-11 10:02:22 UTC +--- lib-src/soundtouch/source/SoundTouch/Makefile.am.orig 2016-07-26 13:34:06 UTC +++ lib-src/soundtouch/source/SoundTouch/Makefile.am @@ -32,7 +32,7 @@ libSoundTouch_la_SOURCES=AAFilter.cpp FI diff --git a/audio/audacity/files/patch-src_AudioIO.h b/audio/audacity/files/patch-src_AudioIO.h index ed42adc80636..9defe48870e4 100644 --- a/audio/audacity/files/patch-src_AudioIO.h +++ b/audio/audacity/files/patch-src_AudioIO.h @@ -1,4 +1,4 @@ ---- src/AudioIO.h.orig 2015-07-11 10:02:22 UTC +--- src/AudioIO.h.orig 2016-07-26 13:34:06 UTC +++ src/AudioIO.h @@ -13,7 +13,7 @@ #ifndef __AUDACITY_AUDIO_IO__ diff --git a/audio/audacity/files/patch-src_BatchCommands.cpp b/audio/audacity/files/patch-src_BatchCommands.cpp index b83a400a9937..c8488f59ba69 100644 --- a/audio/audacity/files/patch-src_BatchCommands.cpp +++ b/audio/audacity/files/patch-src_BatchCommands.cpp @@ -1,4 +1,4 @@ ---- src/BatchCommands.cpp.orig 2016-01-08 22:05:48 UTC +--- src/BatchCommands.cpp.orig 2016-07-26 13:34:06 UTC +++ src/BatchCommands.cpp @@ -151,7 +151,7 @@ bool BatchCommands::ReadChain(const wxSt else if (cmd == wxT("ExportWav")) diff --git a/audio/audacity/files/patch-src_DeviceManager.cpp b/audio/audacity/files/patch-src_DeviceManager.cpp index dd5c7462bdc1..dc85c4ceeaa8 100644 --- a/audio/audacity/files/patch-src_DeviceManager.cpp +++ b/audio/audacity/files/patch-src_DeviceManager.cpp @@ -1,4 +1,4 @@ ---- src/DeviceManager.cpp.orig 2015-07-11 10:02:22 UTC +--- src/DeviceManager.cpp.orig 2016-07-26 13:34:06 UTC +++ src/DeviceManager.cpp @@ -6,7 +6,7 @@ diff --git a/audio/audacity/files/patch-src_FFmpeg.h b/audio/audacity/files/patch-src_FFmpeg.h index 88bc2afb320c..80856b49ddb2 100644 --- a/audio/audacity/files/patch-src_FFmpeg.h +++ b/audio/audacity/files/patch-src_FFmpeg.h @@ -1,4 +1,4 @@ ---- src/FFmpeg.h.orig 2015-07-11 10:02:22 UTC +--- src/FFmpeg.h.orig 2016-07-26 13:34:06 UTC +++ src/FFmpeg.h @@ -689,7 +689,7 @@ extern "C" { FFMPEG_FUNCTION_WITH_RETURN( diff --git a/audio/audacity/files/patch-src_Makefile.am b/audio/audacity/files/patch-src_Makefile.am index d7c1c957124c..5db97e87aa98 100644 --- a/audio/audacity/files/patch-src_Makefile.am +++ b/audio/audacity/files/patch-src_Makefile.am @@ -1,4 +1,4 @@ ---- src/Makefile.am.orig 2016-01-08 22:05:48 UTC +--- src/Makefile.am.orig 2016-07-26 13:34:06 UTC +++ src/Makefile.am @@ -75,8 +75,7 @@ audacity_CPPFLAGS = \ # /usr/local/include/wx-2.8/wx/buffer.h:289:9: note: in expansion of macro 'wxCHECK_RET' diff --git a/audio/audacity/files/patch-src_effects_VST_VSTEffect.cpp b/audio/audacity/files/patch-src_effects_VST_VSTEffect.cpp index 8968344cf839..033d6e597f37 100644 --- a/audio/audacity/files/patch-src_effects_VST_VSTEffect.cpp +++ b/audio/audacity/files/patch-src_effects_VST_VSTEffect.cpp @@ -1,6 +1,6 @@ ---- src/effects/VST/VSTEffect.cpp.orig 2015-07-11 10:02:22 UTC +--- src/effects/VST/VSTEffect.cpp.orig 2016-07-26 13:34:06 UTC +++ src/effects/VST/VSTEffect.cpp -@@ -2576,7 +2576,7 @@ bool VSTEffect::Load() +@@ -2129,7 +2129,7 @@ bool VSTEffect::Load() // symbols. // // Once we define a proper external API, the flags can be removed. diff --git a/audio/audacity/files/patch-src_effects_vamp_LoadVamp.cpp b/audio/audacity/files/patch-src_effects_vamp_LoadVamp.cpp index ed0c5d124687..8cfdf476f077 100644 --- a/audio/audacity/files/patch-src_effects_vamp_LoadVamp.cpp +++ b/audio/audacity/files/patch-src_effects_vamp_LoadVamp.cpp @@ -1,4 +1,4 @@ ---- src/effects/vamp/LoadVamp.cpp.orig 2016-01-08 22:05:48 UTC +--- src/effects/vamp/LoadVamp.cpp.orig 2016-07-26 13:34:06 UTC +++ src/effects/vamp/LoadVamp.cpp @@ -266,7 +266,7 @@ Plugin *VampEffectsModule::FindPlugin(co Plugin *vp = PluginLoader::getInstance()->loadPlugin(key, 48000); // rate doesn't matter here diff --git a/audio/audacity/files/patch-src_import_ImportFLAC.cpp b/audio/audacity/files/patch-src_import_ImportFLAC.cpp index 0673e1e61f54..53454436f169 100644 --- a/audio/audacity/files/patch-src_import_ImportFLAC.cpp +++ b/audio/audacity/files/patch-src_import_ImportFLAC.cpp @@ -1,4 +1,4 @@ ---- src/import/ImportFLAC.cpp.orig 2016-01-08 22:05:48 UTC +--- src/import/ImportFLAC.cpp.orig 2016-07-26 13:34:06 UTC +++ src/import/ImportFLAC.cpp @@ -296,7 +296,7 @@ ImportFileHandle *FLACImportPlugin::Open int cnt; diff --git a/audio/audacity/files/patch-src_prefs_DevicePrefs.cpp b/audio/audacity/files/patch-src_prefs_DevicePrefs.cpp index 261245610b7d..a83688f3cf4f 100644 --- a/audio/audacity/files/patch-src_prefs_DevicePrefs.cpp +++ b/audio/audacity/files/patch-src_prefs_DevicePrefs.cpp @@ -1,4 +1,4 @@ ---- src/prefs/DevicePrefs.cpp.orig 2015-07-11 10:02:22 UTC +--- src/prefs/DevicePrefs.cpp.orig 2016-07-26 13:34:06 UTC +++ src/prefs/DevicePrefs.cpp @@ -30,7 +30,7 @@ other settings. #include diff --git a/audio/audiere/files/patch-src-debug.cpp b/audio/audiere/files/patch-src_debug.cpp similarity index 58% rename from audio/audiere/files/patch-src-debug.cpp rename to audio/audiere/files/patch-src_debug.cpp index f12c4106b2cc..de4181f3a32a 100644 --- a/audio/audiere/files/patch-src-debug.cpp +++ b/audio/audiere/files/patch-src_debug.cpp @@ -1,5 +1,5 @@ ---- src/debug.cpp.orig 2006-02-14 07:57:01.000000000 +0300 -+++ src/debug.cpp 2013-09-14 06:53:30.679226734 +0400 +--- src/debug.cpp.orig 2006-02-14 04:57:01 UTC ++++ src/debug.cpp @@ -1,8 +1,11 @@ #ifdef WIN32 #include diff --git a/audio/audiere/files/patch-src-speexfile-speexfile.cpp b/audio/audiere/files/patch-src_speexfile_speexfile.cpp similarity index 64% rename from audio/audiere/files/patch-src-speexfile-speexfile.cpp rename to audio/audiere/files/patch-src_speexfile_speexfile.cpp index 0f6fa13d1895..d1868e05ad9e 100644 --- a/audio/audiere/files/patch-src-speexfile-speexfile.cpp +++ b/audio/audiere/files/patch-src_speexfile_speexfile.cpp @@ -1,6 +1,6 @@ ---- src/speexfile/speexfile.cpp.orig 2006-02-14 07:57:01.000000000 +0300 -+++ src/speexfile/speexfile.cpp 2008-06-16 04:56:31.000000000 +0400 -@@ -871,7 +871,7 @@ +--- src/speexfile/speexfile.cpp.orig 2006-02-14 04:57:01 UTC ++++ src/speexfile/speexfile.cpp +@@ -871,7 +871,7 @@ int speexfile::initfile () void *speexfile::header_to_decoder ( SpeexHeader *header, int enh_enabled, int *frame_size, int *rate, int *nframes, int forceMode, int *channels, SpeexStereoState *stereo ) { void *st; diff --git a/audio/audiere/files/patch-src-utility.h b/audio/audiere/files/patch-src_utility.h similarity index 54% rename from audio/audiere/files/patch-src-utility.h rename to audio/audiere/files/patch-src_utility.h index c04f37443a4f..e8c704a24a45 100644 --- a/audio/audiere/files/patch-src-utility.h +++ b/audio/audiere/files/patch-src_utility.h @@ -1,5 +1,5 @@ ---- src/utility.h.orig 2006-02-14 07:57:01.000000000 +0300 -+++ src/utility.h 2013-09-12 07:09:46.054424472 +0400 +--- src/utility.h.orig 2006-02-14 04:57:01 UTC ++++ src/utility.h @@ -10,6 +10,7 @@ #include #include diff --git a/audio/aureal-kmod/files/patch-10_Makefile b/audio/aureal-kmod/files/patch-10_Makefile index 7cdc13c17fa2..6f9a898d3553 100644 --- a/audio/aureal-kmod/files/patch-10_Makefile +++ b/audio/aureal-kmod/files/patch-10_Makefile @@ -1,5 +1,5 @@ ---- 10/Makefile.orig Tue Jan 16 15:45:02 2001 -+++ 10/Makefile Tue Jan 16 15:47:38 2001 +--- 10/Makefile.orig 2016-07-26 13:37:02 UTC ++++ 10/Makefile @@ -0,0 +1,3 @@ +MODEL = 10 + diff --git a/audio/aureal-kmod/files/patch-20_Makefile b/audio/aureal-kmod/files/patch-20_Makefile index bfa633a24928..6725bb1654a1 100644 --- a/audio/aureal-kmod/files/patch-20_Makefile +++ b/audio/aureal-kmod/files/patch-20_Makefile @@ -1,5 +1,5 @@ ---- 20/Makefile.orig Tue Jan 16 15:45:02 2001 -+++ 20/Makefile Tue Jan 16 15:47:46 2001 +--- 20/Makefile.orig 2016-07-26 13:37:02 UTC ++++ 20/Makefile @@ -0,0 +1,3 @@ +MODEL = 20 + diff --git a/audio/aureal-kmod/files/patch-30_Makefile b/audio/aureal-kmod/files/patch-30_Makefile index 399c4f137611..6db2037ad3b1 100644 --- a/audio/aureal-kmod/files/patch-30_Makefile +++ b/audio/aureal-kmod/files/patch-30_Makefile @@ -1,5 +1,5 @@ ---- 30/Makefile.orig Tue Jan 16 15:45:03 2001 -+++ 30/Makefile Tue Jan 16 15:47:53 2001 +--- 30/Makefile.orig 2016-07-26 13:37:02 UTC ++++ 30/Makefile @@ -0,0 +1,3 @@ +MODEL = 30 + diff --git a/audio/aureal-kmod/files/patch-Makefile b/audio/aureal-kmod/files/patch-Makefile index dce6932cd9a0..d215c4e716c4 100644 --- a/audio/aureal-kmod/files/patch-Makefile +++ b/audio/aureal-kmod/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Mon Jan 15 18:44:49 2001 -+++ Makefile Mon Jan 15 18:44:49 2001 +--- Makefile.orig 2016-07-26 13:37:02 UTC ++++ Makefile @@ -0,0 +1,3 @@ +SUBDIR = 10 20 30 + diff --git a/audio/aureal-kmod/files/patch-Makefile.inc b/audio/aureal-kmod/files/patch-Makefile.inc index a11b52d92863..f41228e69643 100644 --- a/audio/aureal-kmod/files/patch-Makefile.inc +++ b/audio/aureal-kmod/files/patch-Makefile.inc @@ -1,5 +1,5 @@ ---- Makefile.inc.orig Thu Jun 21 22:34:06 2001 -+++ Makefile.inc Thu Jun 21 22:37:50 2001 +--- Makefile.inc.orig 2016-07-26 13:37:02 UTC ++++ Makefile.inc @@ -0,0 +1,14 @@ +.PATH: /sys/dev/sound/pci ${WRKSRC} + diff --git a/audio/aureal-kmod/files/patch-au88x0.c b/audio/aureal-kmod/files/patch-au88x0.c index 93f3af4fda64..f0f17b4b9a63 100644 --- a/audio/aureal-kmod/files/patch-au88x0.c +++ b/audio/aureal-kmod/files/patch-au88x0.c @@ -1,6 +1,7 @@ ---- au88x0.c.orig 2002-05-10 09:32:55.000000000 +0800 -+++ au88x0.c 2009-02-21 16:14:41.000000000 +0800 -@@ -30,8 +30,9 @@ +--- au88x0.c.orig 2016-07-26 13:37:02 UTC ++++ au88x0.c +@@ -33,10 +33,11 @@ + */ #include -#include @@ -13,7 +14,9 @@ +#include #include -@@ -574,5 +575,9 @@ + SND_DECLARE_FILE("$FreeBSD$"); +@@ -577,7 +578,11 @@ auchan_init(kobj_t obj, void *devinfo, s + ch->channel = c; ch->buffer = b; ch->run = 0; - if (sndbuf_alloc(ch->buffer, au->parent_dmat, AU_BUFFSIZE) == -1) { @@ -24,21 +27,27 @@ + AU_BUFFSIZE) != 0) { printf("sndbuf_alloc failed\n"); return NULL; -@@ -769,5 +774,5 @@ + } +@@ -769,7 +774,7 @@ au_pci_probe(device_t dev) + } if (s) device_set_desc(dev, s); - return s ? 0 : ENXIO; + return s ? BUS_PROBE_DEFAULT : ENXIO; } -@@ -803,5 +808,5 @@ + static int +@@ -803,7 +808,7 @@ au_pci_attach(device_t dev) + data = pci_read_config(dev, PCIR_COMMAND, 2); for (i = 0; i < 3; i++) { - au->regid[i] = PCIR_MAPS + i*4; + au->regid[i] = PCIR_BAR(i); au->regtype[i] = SYS_RES_MEMORY; au->reg[i] = bus_alloc_resource(dev, au->regtype[i], &au->regid[i], 0, ~0, 1, RF_ACTIVE); -@@ -853,5 +858,7 @@ + if (!au->reg[i]) { +@@ -853,7 +858,9 @@ au_pci_attach(device_t dev) + /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, /*maxsize*/AU_BUFFSIZE, /*nsegments*/1, /*maxsegz*/0x3ffff, - /*flags*/0, &au->parent_dmat) != 0) { @@ -47,7 +56,9 @@ + &au->parent_dmat) != 0) { device_printf(dev, "unable to create dma tag\n"); goto bad; -@@ -943,5 +950,5 @@ + } +@@ -943,6 +950,6 @@ static driver_t au_driver = { + DRIVER_MODULE(snd_au88x0, pci, au_driver, pcm_devclass, 0, 0); -MODULE_DEPEND(snd_au88x0, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER); diff --git a/audio/autozen/files/patch-autozen.c b/audio/autozen/files/patch-autozen.c index e0b581671658..3e6654800476 100644 --- a/audio/autozen/files/patch-autozen.c +++ b/audio/autozen/files/patch-autozen.c @@ -1,5 +1,5 @@ ---- ./autozen.c.orig 2001-09-16 04:09:04.000000000 +0200 -+++ ./autozen.c 2012-08-24 12:22:50.546913397 +0200 +--- autozen.c.orig 2001-09-16 02:09:04 UTC ++++ autozen.c @@ -27,7 +27,7 @@ /* "The nice thing about standards..." */ @@ -9,7 +9,7 @@ #else #if defined (__NetBSD__) || defined (__OpenBSD__) #include /* OSS emulation */ -@@ -113,7 +113,7 @@ +@@ -113,7 +113,7 @@ char bQuit=0; // ///////////////////////////////// @@ -18,7 +18,7 @@ #define MAX_HARMONICS 10 #define DEFAULT_HARMONICS 3 -@@ -253,7 +253,7 @@ +@@ -253,7 +253,7 @@ void Play (GtkWidget *widget, gpointer d } @@ -27,7 +27,7 @@ { char *token; int tmp; -@@ -672,7 +672,7 @@ +@@ -672,7 +672,7 @@ void *SoundThread(void *v) } // end while @@ -36,7 +36,7 @@ } gint volTimeOut(gpointer data) { -@@ -729,6 +729,11 @@ +@@ -729,6 +729,11 @@ GtkWidget *create_HelpWindow (const char GtkWidget *help_text; GtkWidget *HelpQuit; @@ -48,7 +48,7 @@ HelpWindow = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_object_set_data (GTK_OBJECT (HelpWindow), "HelpWindow", HelpWindow); gtk_window_set_title (GTK_WINDOW (HelpWindow), "AutoZen Help"); -@@ -740,9 +745,16 @@ +@@ -740,9 +745,16 @@ GtkWidget *create_HelpWindow (const char gtk_widget_show (vbox1); gtk_container_add (GTK_CONTAINER (HelpWindow), vbox1); @@ -65,7 +65,7 @@ gtk_object_set_data (GTK_OBJECT (HelpWindow), "help_text", help_text); -@@ -751,7 +763,11 @@ +@@ -751,7 +763,11 @@ GtkWidget *create_HelpWindow (const char // gtk_widget_set_sensitive (help_text, FALSE); GTK_WIDGET_UNSET_FLAGS (help_text, GTK_CAN_FOCUS); gtk_widget_realize (help_text); diff --git a/audio/beast/files/patch-birnet_birnetcpu.c b/audio/beast/files/patch-birnet_birnetcpu.cc similarity index 68% rename from audio/beast/files/patch-birnet_birnetcpu.c rename to audio/beast/files/patch-birnet_birnetcpu.cc index 1895b2adbea5..2a6c1652c056 100644 --- a/audio/beast/files/patch-birnet_birnetcpu.c +++ b/audio/beast/files/patch-birnet_birnetcpu.cc @@ -1,6 +1,6 @@ ---- birnet/birnetcpu.cc.orig 2008-02-26 23:19:28.000000000 +0100 -+++ birnet/birnetcpu.cc 2008-02-26 23:25:30.000000000 +0100 -@@ -201,7 +201,7 @@ +--- birnet/birnetcpu.cc.orig 2013-01-19 00:23:42 UTC ++++ birnet/birnetcpu.cc +@@ -174,7 +174,7 @@ get_x86_cpu_features (CPUInfo *ci, struct sigaction action, old_action; action.sa_handler = cpu_info_sigill_handler; sigemptyset (&action.sa_mask); diff --git a/audio/beast/files/patch-tools_bseloopfuncs.cc b/audio/beast/files/patch-tools_bseloopfuncs.cc index b7915f62ad3a..ce3167c37cc2 100644 --- a/audio/beast/files/patch-tools_bseloopfuncs.cc +++ b/audio/beast/files/patch-tools_bseloopfuncs.cc @@ -1,6 +1,6 @@ ---- tools/bseloopfuncs.cc.orig 2010-02-14 00:47:12.000000000 +0000 -+++ tools/bseloopfuncs.cc 2010-09-15 12:05:05.000000000 +0000 -@@ -526,7 +526,7 @@ +--- tools/bseloopfuncs.cc.orig 2013-01-19 00:23:42 UTC ++++ tools/bseloopfuncs.cc +@@ -469,7 +469,7 @@ gsl_data_find_loop2 (GslDataHandle * ep = sp + minll; { gdouble score = score_headloop (dhandle, sp, ep - sp, config->block_length / 2, G_MAXDOUBLE); @@ -9,7 +9,7 @@ continue; if (score <= config->score) { -@@ -555,7 +555,7 @@ +@@ -496,7 +496,7 @@ gsl_data_find_loop2 (GslDataHandle * for (ep = sp + minll; ep < cstart; ep++) { gdouble score = score_headloop (dhandle, sp, ep - sp, config->block_length / 2, config->score); diff --git a/audio/beep/files/patch-Makefile b/audio/beep/files/patch-Makefile index 7dda1f794ec1..dafc18050252 100644 --- a/audio/beep/files/patch-Makefile +++ b/audio/beep/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 2015-06-04 12:54:31.348048000 -0500 -+++ Makefile 2015-06-04 12:54:49.272840000 -0500 +--- Makefile.orig 2002-06-09 13:26:27 UTC ++++ Makefile @@ -1,5 +1,10 @@ # $Id: Makefile,v 1.1.1.1 2002/06/09 13:26:27 andrew Exp $ diff --git a/audio/blop/files/patch-configure b/audio/blop/files/patch-configure index e5268056df16..ab225367b2f0 100644 --- a/audio/blop/files/patch-configure +++ b/audio/blop/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Tue Jun 15 18:11:25 2004 -+++ configure Mon Aug 30 03:37:21 2004 -@@ -4533,8 +4533,7 @@ +--- configure.orig 2004-06-15 09:11:25 UTC ++++ configure +@@ -4533,8 +4533,7 @@ if test "${enable_debug+set}" = set; the enableval="$enable_debug" CFLAGS="-pipe -Wall -O0 -g" else diff --git a/audio/boodler/files/patch-configure.py b/audio/boodler/files/patch-configure.py index acfd88e13f7f..9bbcd0408438 100644 --- a/audio/boodler/files/patch-configure.py +++ b/audio/boodler/files/patch-configure.py @@ -1,6 +1,6 @@ ---- configure.py.orig Sat Jan 24 18:44:11 2004 -+++ configure.py Sat Jan 24 18:46:37 2004 -@@ -7,7 +7,7 @@ +--- configure.py.orig 2002-05-01 03:59:28 UTC ++++ configure.py +@@ -7,7 +7,7 @@ import string import getopt usagemessage = 'usage: ' + sys.argv[0] + ' [-d NAME] [-i] [-I /dir/path] [-L /dir/path] [-l]' @@ -9,7 +9,7 @@ helpmessage = 'Boodler configuration script\n\n' + usagemessage + ''' -@@ -68,8 +68,8 @@ +@@ -68,8 +68,8 @@ loop, but does not eliminate them entire ''' try: @@ -20,7 +20,7 @@ except getopt.error, ex: print (sys.argv[0] + ':'), str(ex) print usagemessage -@@ -101,6 +101,8 @@ +@@ -101,6 +101,8 @@ for (opname, opval) in opts: extraheaders.append(opval) if (opname == '--lib' or opname == '-L'): extralibs.append(opval) diff --git a/audio/bristol/files/patch-bin_startBristol.in b/audio/bristol/files/patch-bin_startBristol.in index 2ef201ac8607..d845f2e16374 100644 --- a/audio/bristol/files/patch-bin_startBristol.in +++ b/audio/bristol/files/patch-bin_startBristol.in @@ -1,6 +1,6 @@ ---- bin/startBristol.in.orig 2012-04-27 13:07:18.000000000 +0200 -+++ bin/startBristol.in 2012-09-24 13:30:26.589848964 +0200 -@@ -39,14 +39,19 @@ +--- bin/startBristol.in.orig 2012-04-27 11:07:18 UTC ++++ bin/startBristol.in +@@ -39,14 +39,19 @@ FREQ=0 #PORT=5028 # Randomise the port numbers, can be overridden by -port which would be a # requirement for multitimbral @@ -27,7 +27,7 @@ fi valgrind=0 -@@ -497,12 +502,12 @@ +@@ -497,12 +502,12 @@ if [ $engine = 1 ]; then fi else echo checking availability of TCP port $PORT diff --git a/audio/bristol/files/patch-bristol-bristol.c b/audio/bristol/files/patch-bristol_bristol.c similarity index 62% rename from audio/bristol/files/patch-bristol-bristol.c rename to audio/bristol/files/patch-bristol_bristol.c index e98e58d1f7a3..e53e31dea611 100644 --- a/audio/bristol/files/patch-bristol-bristol.c +++ b/audio/bristol/files/patch-bristol_bristol.c @@ -1,5 +1,5 @@ ---- bristol/bristol.c.orig 2012-04-27 13:04:28.000000000 +0200 -+++ bristol/bristol.c 2012-09-24 15:43:08.299853839 +0200 +--- bristol/bristol.c.orig 2012-04-27 11:04:28 UTC ++++ bristol/bristol.c @@ -27,7 +27,11 @@ #include #include diff --git a/audio/bristol/files/patch-libbristolaudio-audioEngine.c b/audio/bristol/files/patch-libbristolaudio-audioEngine.c deleted file mode 100644 index c8802e81d6cf..000000000000 --- a/audio/bristol/files/patch-libbristolaudio-audioEngine.c +++ /dev/null @@ -1,13 +0,0 @@ ---- libbristolaudio/audioEngine.c.orig 2012-04-27 13:04:29.000000000 +0200 -+++ libbristolaudio/audioEngine.c 2012-09-24 15:41:49.609845763 +0200 -@@ -59,8 +59,10 @@ - #include - #ifdef SUBFRAGMENT - #include -+#ifndef __FreeBSD__ - #include - #endif -+#endif - - #include - diff --git a/audio/bristol/files/patch-libbristolaudio_audioEngine.c b/audio/bristol/files/patch-libbristolaudio_audioEngine.c new file mode 100644 index 000000000000..bf2b7c5d2a7c --- /dev/null +++ b/audio/bristol/files/patch-libbristolaudio_audioEngine.c @@ -0,0 +1,13 @@ +--- libbristolaudio/audioEngine.c.orig 2012-04-27 11:04:29 UTC ++++ libbristolaudio/audioEngine.c +@@ -59,8 +59,10 @@ extern int alsaDevAudioStart(duplexDev * + #include + #ifdef SUBFRAGMENT + #include ++#ifndef __FreeBSD__ + #include + #endif ++#endif + + #include + diff --git a/audio/bristol/files/patch-libbristolaudio-audioGUIOSS.c b/audio/bristol/files/patch-libbristolaudio_audioGUIOSS.c similarity index 56% rename from audio/bristol/files/patch-libbristolaudio-audioGUIOSS.c rename to audio/bristol/files/patch-libbristolaudio_audioGUIOSS.c index cc07057ab980..06d1592d19c6 100644 --- a/audio/bristol/files/patch-libbristolaudio-audioGUIOSS.c +++ b/audio/bristol/files/patch-libbristolaudio_audioGUIOSS.c @@ -1,5 +1,5 @@ ---- libbristolaudio/audioGUIOSS.c.orig 2012-04-27 13:04:29.000000000 +0200 -+++ libbristolaudio/audioGUIOSS.c 2012-09-24 15:42:10.570849586 +0200 +--- libbristolaudio/audioGUIOSS.c.orig 2012-04-27 11:04:29 UTC ++++ libbristolaudio/audioGUIOSS.c @@ -50,7 +50,9 @@ #include #include diff --git a/audio/calf/files/patch-src-Makefile.am b/audio/calf/files/patch-src_Makefile.am similarity index 100% rename from audio/calf/files/patch-src-Makefile.am rename to audio/calf/files/patch-src_Makefile.am diff --git a/audio/calf/files/patch-src__calf__audio_fx.h b/audio/calf/files/patch-src_calf_audio__fx.h similarity index 100% rename from audio/calf/files/patch-src__calf__audio_fx.h rename to audio/calf/files/patch-src_calf_audio__fx.h diff --git a/audio/calf/files/patch-src__calf__osctl.h b/audio/calf/files/patch-src_calf_osctl.h similarity index 100% rename from audio/calf/files/patch-src__calf__osctl.h rename to audio/calf/files/patch-src_calf_osctl.h diff --git a/audio/calf/files/patch-src-giface.cpp b/audio/calf/files/patch-src_giface.cpp similarity index 100% rename from audio/calf/files/patch-src-giface.cpp rename to audio/calf/files/patch-src_giface.cpp diff --git a/audio/calf/files/patch-src-monosynth.cpp b/audio/calf/files/patch-src_monosynth.cpp similarity index 100% rename from audio/calf/files/patch-src-monosynth.cpp rename to audio/calf/files/patch-src_monosynth.cpp diff --git a/audio/cam/files/patch-cam.c b/audio/cam/files/patch-cam.c index ded3a0148ba1..65518f18c2d7 100644 --- a/audio/cam/files/patch-cam.c +++ b/audio/cam/files/patch-cam.c @@ -1,5 +1,5 @@ ---- cam.c.orig 2012-09-03 00:31:15.000000000 +0200 -+++ cam.c 2012-09-03 00:31:42.000000000 +0200 +--- cam.c.orig 1996-04-09 18:17:57 UTC ++++ cam.c @@ -24,9 +24,10 @@ @@ -11,4 +11,4 @@ +int main(int argc, char *argv[]) { if (argc == 1) - { + { diff --git a/audio/cam/files/patch-sounds.c b/audio/cam/files/patch-sounds.c index 5c19493a2743..2325924fd7e4 100644 --- a/audio/cam/files/patch-sounds.c +++ b/audio/cam/files/patch-sounds.c @@ -1,6 +1,5 @@ -diff -ru ../cam-1.02-virgin/sounds.c ./sounds.c ---- ../cam-1.02-virgin/sounds.c Mon Oct 21 13:33:55 1996 -+++ ./sounds.c Sun Nov 10 12:20:22 1996 +--- sounds.c.orig 1996-10-21 18:33:55 UTC ++++ sounds.c @@ -36,7 +36,7 @@ @@ -10,7 +9,7 @@ diff -ru ../cam-1.02-virgin/sounds.c ./sounds.c char *mixer_dev = "/dev/mixer"; struct devices { -@@ -287,7 +287,7 @@ +@@ -287,7 +287,7 @@ void init_sliders(void) else dev_vol[dev_count].vol_right = dev_vol[dev_count].vol_left; diff --git a/audio/cd-console/files/patch-Makefile b/audio/cd-console/files/patch-Makefile index 43fada8853d9..69e3d88e18ef 100644 --- a/audio/cd-console/files/patch-Makefile +++ b/audio/cd-console/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Sat Aug 25 11:09:00 2001 -+++ Makefile Mon Jun 3 19:55:53 2002 +--- Makefile.orig 2001-08-25 18:09:00 UTC ++++ Makefile @@ -5,43 +5,46 @@ # very welcome). diff --git a/audio/cd-console/files/patch-cd-console.cpp b/audio/cd-console/files/patch-cd-console.cpp index a3f1bb1fe3b3..b46674dadcc3 100644 --- a/audio/cd-console/files/patch-cd-console.cpp +++ b/audio/cd-console/files/patch-cd-console.cpp @@ -1,5 +1,5 @@ ---- cd-console.cpp.orig Mon Jun 3 19:46:12 2002 -+++ cd-console.cpp Mon Jun 3 19:46:01 2002 +--- cd-console.cpp.orig 2001-08-25 18:09:00 UTC ++++ cd-console.cpp @@ -1,4 +1,5 @@ #include +#include diff --git a/audio/cd-console/files/patch-cd_ll_bsd.cpp b/audio/cd-console/files/patch-cd__ll__bsd.cpp similarity index 68% rename from audio/cd-console/files/patch-cd_ll_bsd.cpp rename to audio/cd-console/files/patch-cd__ll__bsd.cpp index 4e6a557db5ab..1f97601cc42a 100644 --- a/audio/cd-console/files/patch-cd_ll_bsd.cpp +++ b/audio/cd-console/files/patch-cd__ll__bsd.cpp @@ -1,5 +1,5 @@ ---- cd_ll_bsd.cpp.orig Sat Aug 25 14:09:00 2001 -+++ cd_ll_bsd.cpp Sat Oct 26 21:16:54 2002 +--- cd_ll_bsd.cpp.orig 2001-08-25 18:09:00 UTC ++++ cd_ll_bsd.cpp @@ -10,7 +10,9 @@ #include "cd_ll_bsd.h" diff --git a/audio/cd-discid/files/patch-Makefile b/audio/cd-discid/files/patch-Makefile index 3d8f87cc5f70..980c21996cbc 100644 --- a/audio/cd-discid/files/patch-Makefile +++ b/audio/cd-discid/files/patch-Makefile @@ -1,7 +1,7 @@ ---- Makefile.orig Wed Oct 22 16:40:23 2003 -+++ Makefile Wed Oct 22 16:40:34 2003 +--- Makefile.orig 2003-01-05 20:18:07 UTC ++++ Makefile @@ -1,6 +1,6 @@ - VERSION = 0.9 + VERSION = 0.8 -CC = gcc -CFLAGS = -g -O2 +CC ?= cc diff --git a/audio/cdparanoia/files/patch-Makefile.in b/audio/cdparanoia/files/patch-Makefile.in index 1cf4eb97e407..4137b02ec1aa 100644 --- a/audio/cdparanoia/files/patch-Makefile.in +++ b/audio/cdparanoia/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2001-03-28 00:46:58.000000000 +0200 -+++ Makefile.in 2014-02-09 13:21:39.449603274 +0100 -@@ -8,7 +8,7 @@ +--- Makefile.in.orig 2001-03-27 22:46:58 UTC ++++ Makefile.in +@@ -8,7 +8,7 @@ VPATH=@srcdir@ srcdir=@srcdir@ @SET_MAKE@ @@ -9,7 +9,7 @@ OPT=@OPT@ $(FLAGS) DEBUG=@DEBUG@ $(FLAGS) CC=@CC@ -@@ -32,7 +32,7 @@ +@@ -32,7 +32,7 @@ export VERSION ifeq ($(STATIC),TRUE) LIBS = interface/libcdda_interface.a paranoia/libcdda_paranoia.a \ @@ -18,7 +18,7 @@ LIBDEP = interface/libcdda_interface.a paranoia/libcdda_paranoia.a else LIBS = -lcdda_interface -lcdda_paranoia -lm -@@ -64,28 +64,27 @@ +@@ -64,28 +64,27 @@ slib: cd paranoia && $(MAKE) slib install: diff --git a/audio/cdparanoia/files/patch-configure b/audio/cdparanoia/files/patch-configure index 5b35c542df07..8bbd2f313ccf 100644 --- a/audio/cdparanoia/files/patch-configure +++ b/audio/cdparanoia/files/patch-configure @@ -3,10 +3,9 @@ Index: configure RCS file: /home/cvs/cdparanoia/configure,v retrieving revision 1.1.1.1 retrieving revision 1.2 -diff -u -r1.1.1.1 -r1.2 ---- configure 2003/01/05 09:46:26 1.1.1.1 -+++ configure 2003/01/05 12:41:47 1.2 -@@ -1084,7 +1084,6 @@ +--- configure.orig 2000-04-15 15:13:01 UTC ++++ configure +@@ -1084,7 +1084,6 @@ EOF fi diff --git a/audio/cdparanoia/files/patch-interface-Makefile.in b/audio/cdparanoia/files/patch-interface_Makefile.in similarity index 86% rename from audio/cdparanoia/files/patch-interface-Makefile.in rename to audio/cdparanoia/files/patch-interface_Makefile.in index ba4aee123c93..fc54350e5acd 100644 --- a/audio/cdparanoia/files/patch-interface-Makefile.in +++ b/audio/cdparanoia/files/patch-interface_Makefile.in @@ -3,10 +3,9 @@ Index: interface/Makefile.in RCS file: /home/cvs/cdparanoia/interface/Makefile.in,v retrieving revision 1.1.1.1 retrieving revision 1.3 -diff -u -r1.1.1.1 -r1.3 ---- interface/Makefile.in 2003/01/05 09:46:26 1.1.1.1 -+++ interface/Makefile.in 2003/01/05 12:03:46 1.3 -@@ -9,13 +9,13 @@ +--- interface/Makefile.in.orig 1999-12-14 04:27:59 UTC ++++ interface/Makefile.in +@@ -9,13 +9,13 @@ srcdir=@srcdir@ @SET_MAKE@ FLAGS=@SBPCD_H@ @UCDROM_H@ @TYPESIZES@ @CFLAGS@ OPT=@OPT@ $(FLAGS) @@ -22,7 +21,7 @@ diff -u -r1.1.1.1 -r1.3 CPPFLAGS+=-D_REENTRANT OFILES = scan_devices.o common_interface.o cooked_interface.o interface.o\ -@@ -23,19 +23,15 @@ +@@ -23,19 +23,15 @@ OFILES = scan_devices.o common_interface export VERSION @@ -46,7 +45,7 @@ diff -u -r1.1.1.1 -r1.3 test: $(MAKE) libcdda_interface.a CFLAGS="$(DEBUG)" $(CC) $(DEBUG) -c test.c -@@ -46,7 +42,7 @@ +@@ -46,7 +42,7 @@ libcdda_interface.a: $(OFILES) $(RANLIB) libcdda_interface.a libcdda_interface.so: $(OFILES) diff --git a/audio/cdparanoia/files/patch-interface-cdda_interface.h b/audio/cdparanoia/files/patch-interface_cdda__interface.h similarity index 83% rename from audio/cdparanoia/files/patch-interface-cdda_interface.h rename to audio/cdparanoia/files/patch-interface_cdda__interface.h index cf44b717b52d..5a1e76b22cfa 100644 --- a/audio/cdparanoia/files/patch-interface-cdda_interface.h +++ b/audio/cdparanoia/files/patch-interface_cdda__interface.h @@ -1,5 +1,5 @@ ---- interface/cdda_interface.h.orig Sat Mar 24 02:15:46 2001 -+++ interface/cdda_interface.h Thu Jan 5 22:27:11 2006 +--- interface/cdda_interface.h.orig 2001-03-24 01:15:46 UTC ++++ interface/cdda_interface.h @@ -21,6 +21,11 @@ #include #include @@ -12,7 +12,7 @@ #define MAXTRK 100 typedef struct TOC { /* structure of table of contents */ -@@ -47,13 +52,19 @@ +@@ -47,13 +52,19 @@ typedef struct cdrom_drive{ int opened; /* This struct may just represent a candidate for opening */ char *cdda_device_name; @@ -34,7 +34,7 @@ int interface; int bigendianp; int nsectors; -@@ -83,9 +94,13 @@ +@@ -83,9 +94,13 @@ typedef struct cdrom_drive{ int is_mmc; /* SCSI command buffer and offset pointers */ diff --git a/audio/cdparanoia/files/patch-interface-common_interface.c b/audio/cdparanoia/files/patch-interface_common__interface.c similarity index 79% rename from audio/cdparanoia/files/patch-interface-common_interface.c rename to audio/cdparanoia/files/patch-interface_common__interface.c index 1248487506dc..f631f86bae78 100644 --- a/audio/cdparanoia/files/patch-interface-common_interface.c +++ b/audio/cdparanoia/files/patch-interface_common__interface.c @@ -3,9 +3,8 @@ Index: interface/common_interface.c RCS file: /home/cvs/cdparanoia/interface/common_interface.c,v retrieving revision 1.1.1.1 retrieving revision 1.5 -diff -u -r1.1.1.1 -r1.5 ---- interface/common_interface.c 2003/01/05 09:46:26 1.1.1.1 -+++ interface/common_interface.c 2003/01/06 21:39:53 1.5 +--- interface/common_interface.c.orig 2000-04-19 22:41:04 UTC ++++ interface/common_interface.c @@ -13,12 +13,19 @@ #include "utils.h" #include "smallft.h" @@ -26,7 +25,7 @@ diff -u -r1.1.1.1 -r1.5 return(1); /* failure */ return(0); -@@ -26,6 +33,7 @@ +@@ -26,6 +33,7 @@ int ioctl_ping_cdrom(int fd){ } @@ -34,7 +33,7 @@ diff -u -r1.1.1.1 -r1.5 /* Use the ioctl thingy above ping the cdrom; this will get model info */ char *atapi_drive_info(int fd){ /* Work around the fact that the struct grew without warning in -@@ -46,6 +54,7 @@ +@@ -46,6 +54,7 @@ char *atapi_drive_info(int fd){ free(id); return(ret); } @@ -42,7 +41,7 @@ diff -u -r1.1.1.1 -r1.5 int data_bigendianp(cdrom_drive *d){ float lsb_votes=0; -@@ -171,7 +180,9 @@ +@@ -171,7 +180,9 @@ int data_bigendianp(cdrom_drive *d){ knows the leasoud/leadin size. */ int FixupTOC(cdrom_drive *d,int tracks){ @@ -52,7 +51,7 @@ diff -u -r1.1.1.1 -r1.5 int j; /* First off, make sure the 'starting sector' is >=0 */ -@@ -208,6 +219,8 @@ +@@ -208,6 +219,8 @@ int FixupTOC(cdrom_drive *d,int tracks){ /* For a scsi device, the ioctl must go to the specialized SCSI CDROM device, not the generic device. */ @@ -61,7 +60,7 @@ diff -u -r1.1.1.1 -r1.5 if (d->ioctl_fd != -1) { int result; -@@ -231,6 +244,7 @@ +@@ -231,6 +244,7 @@ int FixupTOC(cdrom_drive *d,int tracks){ return 1; } } diff --git a/audio/cdparanoia/files/patch-interface-cooked_interface.c b/audio/cdparanoia/files/patch-interface_cooked__interface.c similarity index 93% rename from audio/cdparanoia/files/patch-interface-cooked_interface.c rename to audio/cdparanoia/files/patch-interface_cooked__interface.c index cc067fdce434..8d739c3f6ad1 100644 --- a/audio/cdparanoia/files/patch-interface-cooked_interface.c +++ b/audio/cdparanoia/files/patch-interface_cooked__interface.c @@ -1,5 +1,5 @@ ---- interface/cooked_interface.c.orig Wed Apr 19 15:41:04 2000 -+++ interface/cooked_interface.c Fri Nov 7 17:16:03 2003 +--- interface/cooked_interface.c.orig 2000-04-19 22:41:04 UTC ++++ interface/cooked_interface.c @@ -1,6 +1,8 @@ /****************************************************************** * CopyPolicy: GNU Public License 2 applies @@ -17,7 +17,7 @@ static int cooked_readtoc (cdrom_drive *d){ int i; int tracks; -@@ -129,6 +132,142 @@ +@@ -129,6 +132,142 @@ static long cooked_read (cdrom_drive *d, return(sectors); } @@ -160,7 +160,7 @@ /* hook */ static int Dummy (cdrom_drive *d,int Switch){ return(0); -@@ -193,6 +332,7 @@ +@@ -193,6 +332,7 @@ static void check_exceptions(cdrom_drive int cooked_init_drive (cdrom_drive *d){ int ret; @@ -168,7 +168,7 @@ switch(d->drive_type){ case MATSUSHITA_CDROM_MAJOR: /* sbpcd 1 */ case MATSUSHITA_CDROM2_MAJOR: /* sbpcd 2 */ -@@ -243,6 +383,9 @@ +@@ -243,6 +383,9 @@ int cooked_init_drive (cdrom_drive *d){ default: d->nsectors=40; } diff --git a/audio/cdparanoia/files/patch-interface-interface.c b/audio/cdparanoia/files/patch-interface_interface.c similarity index 82% rename from audio/cdparanoia/files/patch-interface-interface.c rename to audio/cdparanoia/files/patch-interface_interface.c index 99e7372081e7..3b8a43d48496 100644 --- a/audio/cdparanoia/files/patch-interface-interface.c +++ b/audio/cdparanoia/files/patch-interface_interface.c @@ -1,6 +1,6 @@ ---- interface/interface.c.orig Thu Apr 20 00:41:04 2000 -+++ interface/interface.c Sat Jan 7 14:31:19 2006 -@@ -30,11 +30,24 @@ +--- interface/interface.c.orig 2000-04-19 22:41:04 UTC ++++ interface/interface.c +@@ -30,11 +30,24 @@ int cdda_close(cdrom_drive *d){ _clean_messages(d); if(d->cdda_device_name)free(d->cdda_device_name); diff --git a/audio/cdparanoia/files/patch-interface-low_interface.h b/audio/cdparanoia/files/patch-interface_low__interface.h similarity index 89% rename from audio/cdparanoia/files/patch-interface-low_interface.h rename to audio/cdparanoia/files/patch-interface_low__interface.h index 1ad09f12b69b..4d8f491e4455 100644 --- a/audio/cdparanoia/files/patch-interface-low_interface.h +++ b/audio/cdparanoia/files/patch-interface_low__interface.h @@ -3,9 +3,8 @@ Index: interface/low_interface.h RCS file: /home/cvs/cdparanoia/interface/low_interface.h,v retrieving revision 1.1.1.1 retrieving revision 1.3 -diff -u -r1.1.1.1 -r1.3 ---- interface/low_interface.h 2003/01/05 09:46:26 1.1.1.1 -+++ interface/low_interface.h 2003/01/06 21:26:23 1.3 +--- interface/low_interface.h.orig 2001-03-26 06:12:11 UTC ++++ interface/low_interface.h @@ -25,6 +25,8 @@ #include #include diff --git a/audio/cdparanoia/files/patch-interface-scan_devices.c b/audio/cdparanoia/files/patch-interface_scan__devices.c similarity index 91% rename from audio/cdparanoia/files/patch-interface-scan_devices.c rename to audio/cdparanoia/files/patch-interface_scan__devices.c index 7cc9b3b7b5be..ce83179151b5 100644 --- a/audio/cdparanoia/files/patch-interface-scan_devices.c +++ b/audio/cdparanoia/files/patch-interface_scan__devices.c @@ -1,5 +1,5 @@ ---- interface/scan_devices.c.orig Mon Mar 26 07:44:01 2001 -+++ interface/scan_devices.c Thu Jan 5 22:27:44 2006 +--- interface/scan_devices.c.orig 2001-03-26 05:44:01 UTC ++++ interface/scan_devices.c @@ -1,6 +1,8 @@ /****************************************************************** * CopyPolicy: GNU Public License 2 applies @@ -18,7 +18,7 @@ static char *scsi_cdrom_prefixes[]={ "/dev/scd", "/dev/sr", -@@ -49,6 +53,17 @@ +@@ -49,6 +53,17 @@ static char *cdrom_devices[]={ "/dev/cm206cd", "/dev/gscd", "/dev/optcd",NULL}; @@ -36,7 +36,7 @@ /* Functions here look for a cdrom drive; full init of a drive type happens in interface.c */ -@@ -75,10 +90,12 @@ +@@ -75,10 +90,12 @@ cdrom_drive *cdda_find_a_cdrom(int messa if((d=cdda_identify(buffer,messagedest,messages))) return(d); idmessage(messagedest,messages,"",NULL); @@ -49,7 +49,7 @@ } }else{ /* Name. Go for it. */ -@@ -117,8 +134,14 @@ +@@ -117,8 +134,14 @@ cdrom_drive *cdda_identify(const char *d } #endif @@ -64,7 +64,7 @@ #ifdef CDDA_TEST if(!d)d=cdda_identify_test(device,messagedest,messages); -@@ -143,6 +166,7 @@ +@@ -143,6 +166,7 @@ char *test_resolve_symlink(const char *f } @@ -72,7 +72,7 @@ cdrom_drive *cdda_identify_cooked(const char *dev, int messagedest, char **messages){ -@@ -275,6 +299,61 @@ +@@ -275,6 +299,61 @@ cdrom_drive *cdda_identify_cooked(const return(d); } @@ -134,7 +134,7 @@ struct sg_id { long l1; /* target | lun << 8 | channel << 16 | low_ino << 24 */ long l2; /* Unique id */ -@@ -390,6 +469,7 @@ +@@ -390,6 +469,7 @@ matchfail: if(dev!=-1)close(dev); return(NULL); } @@ -142,7 +142,7 @@ void strscat(char *a,char *b,int n){ int i; -@@ -401,6 +481,7 @@ +@@ -401,6 +481,7 @@ void strscat(char *a,char *b,int n){ strcat(a," "); } @@ -150,7 +150,7 @@ /* At this point, we're going to punt compatability before SG2, and allow only SG2 and SG3 */ static int verify_SG_version(cdrom_drive *d,int messagedest, -@@ -653,6 +734,89 @@ +@@ -653,6 +734,89 @@ cdda_identify_scsi_fail: if(g_fd!=-1)close(g_fd); return(NULL); } diff --git a/audio/cdparanoia/files/patch-interface-scsi_interface.c b/audio/cdparanoia/files/patch-interface_scsi__interface.c similarity index 91% rename from audio/cdparanoia/files/patch-interface-scsi_interface.c rename to audio/cdparanoia/files/patch-interface_scsi__interface.c index b482169b4dfd..15fe0300e0d7 100644 --- a/audio/cdparanoia/files/patch-interface-scsi_interface.c +++ b/audio/cdparanoia/files/patch-interface_scsi__interface.c @@ -1,5 +1,5 @@ ---- interface/scsi_interface.c.orig 2001-03-23 17:15:46.000000000 -0800 -+++ interface/scsi_interface.c 2011-10-17 21:33:00.000000000 -0700 +--- interface/scsi_interface.c.orig 2001-03-24 01:15:46 UTC ++++ interface/scsi_interface.c @@ -3,6 +3,8 @@ * Original interface.c Copyright (C) 1994-1997 * Eissfeldt heiko@colossus.escape.de @@ -9,7 +9,7 @@ * * Generic SCSI interface specific code. * -@@ -23,6 +25,7 @@ +@@ -23,6 +25,7 @@ static void tweak_SG_buffer(cdrom_drive int table,reserved; char buffer[256]; @@ -17,7 +17,7 @@ /* maximum transfer size? */ if(ioctl(d->cdda_fd,SG_GET_RESERVED_SIZE,&reserved)){ /* Up, guess not. */ -@@ -59,8 +62,17 @@ +@@ -59,8 +62,17 @@ static void tweak_SG_buffer(cdrom_drive cdmessage(d,"\tCouldn't disable command queue! Continuing anyway...\n"); } @@ -35,7 +35,7 @@ static void reset_scsi(cdrom_drive *d){ int arg; d->enable_cdda(d,0); -@@ -74,6 +86,30 @@ +@@ -74,6 +86,30 @@ static void reset_scsi(cdrom_drive *d){ d->enable_cdda(d,1); } @@ -66,7 +66,7 @@ static void clear_garbage(cdrom_drive *d){ fd_set fdset; struct timeval tv; -@@ -104,8 +140,10 @@ +@@ -104,8 +140,10 @@ static void clear_garbage(cdrom_drive *d flag=1; } } @@ -77,7 +77,7 @@ static int handle_scsi_cmd(cdrom_drive *d, unsigned int cmd_len, unsigned int in_size, -@@ -284,6 +322,95 @@ +@@ -284,6 +322,95 @@ static int handle_scsi_cmd(cdrom_drive * return(0); } @@ -173,7 +173,7 @@ /* Group 1 (10b) command */ static int mode_sense_atapi(cdrom_drive *d,int size,int page){ -@@ -833,30 +960,37 @@ +@@ -833,30 +960,37 @@ static long scsi_read_map (cdrom_drive * while(1) { if((err=map(d,(p?buffer:NULL),begin,sectors))){ if(d->report_all){ @@ -220,7 +220,7 @@ } if(!d->error_retry)return(-7); -@@ -1307,6 +1441,7 @@ +@@ -1307,6 +1441,7 @@ static void check_fua_bit(cdrom_drive *d return; } @@ -228,7 +228,7 @@ static int check_atapi(cdrom_drive *d){ int atapiret=-1; int fd = d->cdda_fd; /* this is the correct fd (not ioctl_fd), as the -@@ -1333,6 +1468,53 @@ +@@ -1333,6 +1468,53 @@ static int check_atapi(cdrom_drive *d){ } } @@ -282,7 +282,7 @@ static int check_mmc(cdrom_drive *d){ char *b; cdmessage(d,"\nChecking for MMC style command set...\n"); -@@ -1379,6 +1561,7 @@ +@@ -1379,6 +1561,7 @@ static void check_exceptions(cdrom_drive } } @@ -290,7 +290,7 @@ /* request vendor brand and model */ unsigned char *scsi_inquiry(cdrom_drive *d){ memcpy(d->sg_buffer,(char[]){ 0x12,0,0,0,56,0},6); -@@ -1389,6 +1572,7 @@ +@@ -1389,6 +1572,7 @@ unsigned char *scsi_inquiry(cdrom_drive } return (d->sg_buffer); } @@ -298,7 +298,7 @@ int scsi_init_drive(cdrom_drive *d){ -@@ -1458,8 +1642,12 @@ +@@ -1458,8 +1642,12 @@ int scsi_init_drive(cdrom_drive *d){ check_fua_bit(d); d->error_retry=1; diff --git a/audio/cdparanoia/files/patch-interface-utils.h b/audio/cdparanoia/files/patch-interface_utils.h similarity index 75% rename from audio/cdparanoia/files/patch-interface-utils.h rename to audio/cdparanoia/files/patch-interface_utils.h index 49b0b57289c4..f89e36217135 100644 --- a/audio/cdparanoia/files/patch-interface-utils.h +++ b/audio/cdparanoia/files/patch-interface_utils.h @@ -3,9 +3,8 @@ Index: interface/utils.h RCS file: /home/cvs/cdparanoia/interface/utils.h,v retrieving revision 1.1.1.1 retrieving revision 1.3 -diff -u -r1.1.1.1 -r1.3 ---- interface/utils.h 2003/01/05 09:46:26 1.1.1.1 -+++ interface/utils.h 2003/01/06 23:34:21 1.3 +--- interface/utils.h.orig 2000-04-19 22:41:04 UTC ++++ interface/utils.h @@ -1,4 +1,9 @@ +#ifdef LINUX #include diff --git a/audio/cdparanoia/files/patch-paranoia-Makefile.in b/audio/cdparanoia/files/patch-paranoia_Makefile.in similarity index 77% rename from audio/cdparanoia/files/patch-paranoia-Makefile.in rename to audio/cdparanoia/files/patch-paranoia_Makefile.in index 32d7c25fc532..f08e7c035cb2 100644 --- a/audio/cdparanoia/files/patch-paranoia-Makefile.in +++ b/audio/cdparanoia/files/patch-paranoia_Makefile.in @@ -1,6 +1,6 @@ ---- paranoia/Makefile.in.orig +--- paranoia/Makefile.in.orig 1999-12-14 04:28:04 UTC +++ paranoia/Makefile.in -@@ -24,18 +24,14 @@ +@@ -24,18 +24,14 @@ OFILES = paranoia.o p_block.o overlap.o LIBS = ../interface/libcdda_interface.a -lm export VERSION diff --git a/audio/cdparanoia/files/patch-paranoia-cdda_paranoia.h b/audio/cdparanoia/files/patch-paranoia_cdda__paranoia.h similarity index 72% rename from audio/cdparanoia/files/patch-paranoia-cdda_paranoia.h rename to audio/cdparanoia/files/patch-paranoia_cdda__paranoia.h index 3d32c9f6982d..f49133c7992a 100644 --- a/audio/cdparanoia/files/patch-paranoia-cdda_paranoia.h +++ b/audio/cdparanoia/files/patch-paranoia_cdda__paranoia.h @@ -3,9 +3,8 @@ Index: paranoia/cdda_paranoia.h RCS file: /home/cvs/cdparanoia/paranoia/cdda_paranoia.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 -diff -u -r1.1.1.1 -r1.2 ---- paranoia/cdda_paranoia.h 2003/01/05 09:46:26 1.1.1.1 -+++ paranoia/cdda_paranoia.h 2003/01/05 12:55:20 1.2 +--- paranoia/cdda_paranoia.h.orig 2001-03-24 01:15:47 UTC ++++ paranoia/cdda_paranoia.h @@ -34,6 +34,8 @@ #define PARANOIA_MODE_NEVERSKIP 32 diff --git a/audio/cdparanoia/files/patch-utils.h b/audio/cdparanoia/files/patch-utils.h index 3a1f6796814b..bca77cd1c0ba 100644 --- a/audio/cdparanoia/files/patch-utils.h +++ b/audio/cdparanoia/files/patch-utils.h @@ -3,9 +3,8 @@ Index: utils.h RCS file: /home/cvs/cdparanoia/utils.h,v retrieving revision 1.1.1.1 retrieving revision 1.3 -diff -u -r1.1.1.1 -r1.3 ---- utils.h 2003/01/05 09:46:26 1.1.1.1 -+++ utils.h 2003/01/06 23:34:21 1.3 +--- utils.h.orig 2000-04-19 22:41:04 UTC ++++ utils.h @@ -1,5 +1,9 @@ #include +#ifdef Linux diff --git a/audio/cdparanoia/files/patch-version.h b/audio/cdparanoia/files/patch-version.h index 179759417811..ef314df2e976 100644 --- a/audio/cdparanoia/files/patch-version.h +++ b/audio/cdparanoia/files/patch-version.h @@ -3,9 +3,8 @@ Index: version.h RCS file: /home/cvs/cdparanoia/version.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 -diff -u -r1.1.1.1 -r1.2 ---- version.h 2003/01/05 09:46:26 1.1.1.1 -+++ version.h 2003/01/07 00:49:01 1.2 +--- version.h.orig 2001-03-24 01:15:45 UTC ++++ version.h @@ -8,6 +8,8 @@ diff --git a/audio/cdplay/Makefile b/audio/cdplay/Makefile index 0129a5099dba..58d09c944902 100644 --- a/audio/cdplay/Makefile +++ b/audio/cdplay/Makefile @@ -26,7 +26,7 @@ post-patch: -e 's/^OPTIMISE=.*$$/OPTIMISE=/'\ ${WRKSRC}/Makefile -pre-patch: +post-extract: @${GUNZIP_CMD} ${WRKSRC}/cdplay.1.gz do-install: diff --git a/audio/cdplay/files/patch-cd.c b/audio/cdplay/files/patch-cd.c index e70d3ce1094f..18fb70325166 100644 --- a/audio/cdplay/files/patch-cd.c +++ b/audio/cdplay/files/patch-cd.c @@ -1,6 +1,6 @@ ---- cd.c.orig Mon May 19 15:44:40 2003 -+++ cd.c Mon May 19 15:53:44 2003 -@@ -98,8 +98,16 @@ +--- cd.c.orig 1997-10-24 15:38:25 UTC ++++ cd.c +@@ -98,8 +98,16 @@ void play_track(int track) cd_play.end_s=cdinfo.s_sec[cdinfo.l_track-1]; cd_play.end_f=cdinfo.s_frame[cdinfo.l_track-1]; @@ -19,7 +19,7 @@ } /* Skips one track forward */ -@@ -111,7 +119,7 @@ +@@ -111,7 +119,7 @@ void next(void) /* Quess */ void prev(void) { @@ -28,7 +28,7 @@ play_track(cdinfo.c_track-1); else play_track(cdinfo.c_track); } -@@ -141,17 +149,59 @@ +@@ -141,17 +149,59 @@ void cdpause(void) } } @@ -92,7 +92,7 @@ cd_play.start_m=cdinfo.c_seca/60; } cd_play.start_f=1; -@@ -160,19 +210,25 @@ +@@ -160,19 +210,25 @@ void ff(void) cd_play.end_f=cdinfo.s_frame[cdinfo.l_track-1]; if(ioctl(cd_fd,CDIOCPLAYMSF,(char *) &cd_play)<0) per(); @@ -122,7 +122,7 @@ cd_play.start_m=cdinfo.c_seca/60; } cd_play.start_f=1; -@@ -181,6 +237,7 @@ +@@ -181,6 +237,7 @@ void rew(void) cd_play.end_f=cdinfo.s_frame[cdinfo.l_track-1]; if(ioctl(cd_fd,CDIOCPLAYMSF,(char *) &cd_play)<0) per(); @@ -130,7 +130,7 @@ } /* Spit cd out */ -@@ -192,6 +249,7 @@ +@@ -192,6 +249,7 @@ void eject(void) per(); close(cd_fd); cdinfo.eject=1; diff --git a/audio/cdplay/files/patch-cdplay.1 b/audio/cdplay/files/patch-cdplay.1 index 4f08b88aa716..c35918430495 100644 --- a/audio/cdplay/files/patch-cdplay.1 +++ b/audio/cdplay/files/patch-cdplay.1 @@ -1,7 +1,6 @@ -diff -ur ../cdplay-0.92.orig/cdplay.1 ./cdplay.1 ---- ../cdplay-0.92.orig/cdplay.1 Fri Nov 7 20:13:21 1997 -+++ ./cdplay.1 Sat Jun 27 00:29:34 1998 -@@ -35,15 +35,14 @@ +--- cdplay.1.orig 1997-11-08 01:13:21 UTC ++++ cdplay.1 +@@ -35,15 +35,14 @@ cdplay \- play CD's with nice interface ] .SH DESCRIPTION .B cdplay @@ -20,7 +19,7 @@ diff -ur ../cdplay-0.92.orig/cdplay.1 ./cdplay.1 .TP .BR -h Display a brief help message. -@@ -59,6 +58,9 @@ +@@ -59,6 +58,9 @@ Stop. Stops cd and sets current track to Space Pause. If cd is already on pause continues. .TP @@ -30,7 +29,7 @@ diff -ur ../cdplay-0.92.orig/cdplay.1 ./cdplay.1 \'e\' Eject. Spits the disc out of your drive. .TP -@@ -79,14 +81,18 @@ +@@ -79,14 +81,18 @@ Skip to track [num]. NOTE! works only fo .TP \'q\' Quit. Exit the program. diff --git a/audio/cdplay/files/patch-cdplay.h b/audio/cdplay/files/patch-cdplay.h index c8b3b8b3859f..abccf6bc0899 100644 --- a/audio/cdplay/files/patch-cdplay.h +++ b/audio/cdplay/files/patch-cdplay.h @@ -1,6 +1,6 @@ ---- ./cdplay.h.orig Mon May 19 15:44:41 2003 -+++ ./cdplay.h Mon May 19 15:55:12 2003 -@@ -71,8 +71,9 @@ +--- cdplay.h.orig 1997-11-17 07:21:55 UTC ++++ cdplay.h +@@ -71,8 +71,9 @@ void next(void); void prev(void); void stop(void); void cdpause(void); @@ -12,7 +12,7 @@ void eject(void); /* Terminal related functions */ -@@ -90,6 +91,7 @@ +@@ -90,6 +91,7 @@ void hs_cont(void); void hs_winch(void); void do_exit(int); void do_stop(void); diff --git a/audio/cdplay/files/patch-main.c b/audio/cdplay/files/patch-main.c index b37036c209f9..f9bb8d845181 100644 --- a/audio/cdplay/files/patch-main.c +++ b/audio/cdplay/files/patch-main.c @@ -1,6 +1,6 @@ ---- ./main.c.orig Mon May 19 15:44:41 2003 -+++ ./main.c Mon May 19 15:55:24 2003 -@@ -35,11 +35,14 @@ +--- main.c.orig 1997-11-17 09:26:26 UTC ++++ main.c +@@ -35,11 +35,14 @@ extern struct termios old_ttyattr; int main(int argc, char **argv) { char cmd[1]; @@ -16,7 +16,7 @@ if(argc>1 && !strcmp(argv[1],"-d")) cd_device=argv[2]; else if(argc>1) -@@ -68,19 +71,20 @@ +@@ -68,19 +71,20 @@ int main(int argc, char **argv) while(1){ if(select(1,&rset,(fd_set *) 0,(fd_set *) 0,&stime)>0) { @@ -43,12 +43,10 @@ } update_cdinfo(); move_up(5); -@@ -90,6 +94,36 @@ - } - +@@ -92,6 +96,36 @@ int main(int argc, char **argv) exit(0); -+} -+ + } + +void getcommand(char *command, int *repetivity) +{ + static char stored_command; @@ -77,6 +75,8 @@ + } + stored_command='\0'; + return; - } - ++} ++ void hs_cont(void) + { + init_term(); diff --git a/audio/chordpack/files/patch-chordpack b/audio/chordpack/files/patch-chordpack index 700b6c45dbbe..6c265f7b218c 100644 --- a/audio/chordpack/files/patch-chordpack +++ b/audio/chordpack/files/patch-chordpack @@ -1,6 +1,6 @@ ---- chordpack.orig Sun Jul 8 01:09:29 2001 -+++ chordpack Sun Jul 8 01:09:32 2001 -@@ -1590,7 +1590,7 @@ +--- chordpack.orig 2001-07-23 13:47:11 UTC ++++ chordpack +@@ -1598,7 +1598,7 @@ if ($task eq "ascii") { # {{{ Comment (programmer's kind of) if (/^\x23/) { # \x23 is hash diff --git a/audio/clunk/files/patch-CMakeLists.txt b/audio/clunk/files/patch-CMakeLists.txt index 6f69ed5535e9..5905d70bfffc 100644 --- a/audio/clunk/files/patch-CMakeLists.txt +++ b/audio/clunk/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2014-09-29 10:48:48.000000000 +0400 -+++ CMakeLists.txt 2015-01-23 14:17:02.000000000 +0300 -@@ -77,7 +77,7 @@ +--- CMakeLists.txt.orig 2014-09-29 06:48:48 UTC ++++ CMakeLists.txt +@@ -77,7 +77,7 @@ set(PUBLIC_HEADERS clunk/v3.h clunk/clunk_c.h clunk/window_function.h diff --git a/audio/clunk/files/patch-clunk__mdct_context.h b/audio/clunk/files/patch-clunk_mdct__context.h similarity index 63% rename from audio/clunk/files/patch-clunk__mdct_context.h rename to audio/clunk/files/patch-clunk_mdct__context.h index a66c079fdded..1d694ef4a1ce 100644 --- a/audio/clunk/files/patch-clunk__mdct_context.h +++ b/audio/clunk/files/patch-clunk_mdct__context.h @@ -1,6 +1,6 @@ ---- clunk/mdct_context.h.orig 2014-09-29 10:48:48.000000000 +0400 -+++ clunk/mdct_context.h 2015-01-23 14:14:23.000000000 +0300 -@@ -61,7 +61,7 @@ +--- clunk/mdct_context.h.orig 2014-09-29 06:48:48 UTC ++++ clunk/mdct_context.h +@@ -61,7 +61,7 @@ public: T data[N]; diff --git a/audio/cmp3/files/patch-cmp3.h b/audio/cmp3/files/patch-cmp3.h index 4e752f1dc522..8ee9d208c44f 100644 --- a/audio/cmp3/files/patch-cmp3.h +++ b/audio/cmp3/files/patch-cmp3.h @@ -1,4 +1,4 @@ ---- cmp3.h.orig 2001-07-01 06:38:08.000000000 +0200 +--- cmp3.h.orig 2001-07-01 04:38:08 UTC +++ cmp3.h @@ -1,7 +1,7 @@ #ifndef _CMP3_H diff --git a/audio/cmp3/files/patch-cmp3listfiles.c b/audio/cmp3/files/patch-cmp3listfiles.c index 332b51152e1c..291a3a2d3f67 100644 --- a/audio/cmp3/files/patch-cmp3listfiles.c +++ b/audio/cmp3/files/patch-cmp3listfiles.c @@ -1,6 +1,6 @@ ---- cmp3listfiles.c.orig Fri Jul 18 17:55:33 2003 -+++ cmp3listfiles.c Fri Jul 18 17:56:23 2003 -@@ -270,13 +270,13 @@ +--- cmp3listfiles.c.orig 2001-06-13 20:13:16 UTC ++++ cmp3listfiles.c +@@ -270,13 +270,13 @@ void writelist(char *filepath) /* XXX - alert person */ return; fprintf(outfile, diff --git a/audio/cmp3/files/patch-cmp3main.c b/audio/cmp3/files/patch-cmp3main.c index dc0f0748a58d..bd2ad501d9f5 100644 --- a/audio/cmp3/files/patch-cmp3main.c +++ b/audio/cmp3/files/patch-cmp3main.c @@ -1,6 +1,6 @@ ---- cmp3main.c.orig 2001-07-07 16:17:23.000000000 -0300 -+++ cmp3main.c 2009-09-20 11:11:06.000000000 -0300 -@@ -33,13 +33,18 @@ +--- cmp3main.c.orig 2001-07-07 19:17:23 UTC ++++ cmp3main.c +@@ -33,13 +33,18 @@ int main(int argc, char **argv) int lastleftline = 0; int lastrightline = 0; char *init_dir = NULL; diff --git a/audio/cmp3/files/patch-cmp3volume.c b/audio/cmp3/files/patch-cmp3volume.c index 7bc9af0d5967..b082de7b2379 100644 --- a/audio/cmp3/files/patch-cmp3volume.c +++ b/audio/cmp3/files/patch-cmp3volume.c @@ -1,5 +1,5 @@ ---- cmp3volume.c.orig Sun Jul 1 13:38:08 2001 -+++ cmp3volume.c Sat Mar 20 00:23:51 2004 +--- cmp3volume.c.orig 2001-07-01 04:38:08 UTC ++++ cmp3volume.c @@ -3,11 +3,7 @@ */ diff --git a/audio/cmp3/files/patch-nevlib_Makefile.in b/audio/cmp3/files/patch-nevlib_Makefile.in index 599ba777cad7..22432bcca089 100644 --- a/audio/cmp3/files/patch-nevlib_Makefile.in +++ b/audio/cmp3/files/patch-nevlib_Makefile.in @@ -1,5 +1,5 @@ ---- nevlib/Makefile.in.orig 2001-07-29 02:09:13.000000000 -0300 -+++ nevlib/Makefile.in 2009-09-20 11:11:06.000000000 -0300 +--- nevlib/Makefile.in.orig 2001-07-29 05:09:13 UTC ++++ nevlib/Makefile.in @@ -1,6 +1,6 @@ CC = @CC@ diff --git a/audio/cmp3/files/patch-rnmp3.c b/audio/cmp3/files/patch-rnmp3.c index 4c5d0805f25d..17d87ddcffc1 100644 --- a/audio/cmp3/files/patch-rnmp3.c +++ b/audio/cmp3/files/patch-rnmp3.c @@ -1,6 +1,6 @@ ---- rnmp3.c.orig Fri Jul 18 18:00:43 2003 -+++ rnmp3.c Fri Jul 18 18:02:36 2003 -@@ -256,25 +256,21 @@ +--- rnmp3.c.orig 2001-06-13 20:13:19 UTC ++++ rnmp3.c +@@ -256,25 +256,21 @@ int main(int argc, char **argv) void usage() { diff --git a/audio/cmus/files/patch-Makefile b/audio/cmus/files/patch-Makefile index c988b9658a0b..33e64edfb043 100644 --- a/audio/cmus/files/patch-Makefile +++ b/audio/cmus/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2012-11-11 17:40:55.000000000 +0100 -+++ Makefile 2012-11-11 17:42:25.000000000 +0100 -@@ -105,7 +105,7 @@ +--- Makefile.orig 2014-08-11 07:48:28 UTC ++++ Makefile +@@ -111,7 +111,7 @@ $(opus-objs): CFLAGS += $(OPUS_CFLAGS) $(wavpack-objs): CFLAGS += $(WAVPACK_CFLAGS) $(mp4-objs): CFLAGS += $(MP4_CFLAGS) $(aac-objs): CFLAGS += $(AAC_CFLAGS) @@ -9,7 +9,7 @@ $(cue-objs): CFLAGS += $(CUE_CFLAGS) cdio.so: $(cdio-objs) $(libcmus-y) -@@ -216,10 +216,10 @@ +@@ -231,10 +231,10 @@ $(man7): Doc/ttman $(call cmd,ttman) Doc/ttman.o: Doc/ttman.c diff --git a/audio/cmus/files/patch-scripts-checks.sh b/audio/cmus/files/patch-scripts_checks.sh similarity index 100% rename from audio/cmus/files/patch-scripts-checks.sh rename to audio/cmus/files/patch-scripts_checks.sh diff --git a/audio/cpige/files/patch-gui_Makefile.in b/audio/cpige/files/patch-gui_Makefile.in new file mode 100644 index 000000000000..3259cf4e73b1 --- /dev/null +++ b/audio/cpige/files/patch-gui_Makefile.in @@ -0,0 +1,10 @@ +--- gui/Makefile.in.orig 2006-08-20 14:51:17 UTC ++++ gui/Makefile.in +@@ -1,6 +1,6 @@ + CFLAGS += @CFLAGS@ -I.. + CLIBS += @CLIBS@ +-CC := gcc ++CC ?= gcc + + all: configurator + diff --git a/audio/cpige/files/patch-gui__Makefile.in b/audio/cpige/files/patch-gui__Makefile.in deleted file mode 100644 index 5aa1aac913ca..000000000000 --- a/audio/cpige/files/patch-gui__Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- ./gui/Makefile.in.orig 2008-05-01 11:15:47.000000000 +0300 -+++ ./gui/Makefile.in 2008-05-01 11:16:16.000000000 +0300 -@@ -1,6 +1,6 @@ - CFLAGS += @CFLAGS@ -I.. - CLIBS += @CLIBS@ --CC := gcc -+CC ?= gcc - - all: configurator - diff --git a/audio/cpige/files/patch-gui__configure b/audio/cpige/files/patch-gui_configure similarity index 73% rename from audio/cpige/files/patch-gui__configure rename to audio/cpige/files/patch-gui_configure index 63e86cad1675..e19adcc597b4 100644 --- a/audio/cpige/files/patch-gui__configure +++ b/audio/cpige/files/patch-gui_configure @@ -1,5 +1,5 @@ ---- ./gui/configure.orig 2006-08-20 17:51:17.000000000 +0300 -+++ ./gui/configure 2008-05-01 11:15:42.000000000 +0300 +--- gui/configure.orig 2006-08-20 14:51:17 UTC ++++ gui/configure @@ -3,8 +3,6 @@ PKG_CONFIG=`which pkg-config` @@ -9,7 +9,7 @@ if [ ! -x "$PKG_CONFIG" ]; then echo "cPige GUI requires pkg-config to build." -@@ -12,7 +10,7 @@ +@@ -12,7 +10,7 @@ if [ ! -x "$PKG_CONFIG" ]; then fi for lib in $libs; do diff --git a/audio/cpige/files/patch-mynet.c b/audio/cpige/files/patch-mynet.c index d7a8b6f8a952..0fd801d9fe0d 100644 --- a/audio/cpige/files/patch-mynet.c +++ b/audio/cpige/files/patch-mynet.c @@ -1,6 +1,6 @@ ---- ./mynet.c.orig 2006-08-20 17:51:17.000000000 +0300 -+++ ./mynet.c 2012-08-12 12:29:05.000000000 +0300 -@@ -86,7 +86,7 @@ +--- mynet.c.orig 2006-08-20 14:51:17 UTC ++++ mynet.c +@@ -86,7 +86,7 @@ int server_connect (char *servername, in { struct sockaddr_in serverSockAddr; struct hostent *serverHostEnt; @@ -9,7 +9,7 @@ #if WIN32 int res; -@@ -105,7 +105,7 @@ +@@ -105,7 +105,7 @@ int server_connect (char *servername, in hostAddr = inet_addr(servername); /* If it is an ip address */ diff --git a/audio/creox/files/patch-creox__effects_dsp__distortionprocessor.cpp b/audio/creox/files/patch-creox_effects__dsp_distortionprocessor.cpp similarity index 74% rename from audio/creox/files/patch-creox__effects_dsp__distortionprocessor.cpp rename to audio/creox/files/patch-creox_effects__dsp_distortionprocessor.cpp index b75af1a1f190..2361e4233b47 100644 --- a/audio/creox/files/patch-creox__effects_dsp__distortionprocessor.cpp +++ b/audio/creox/files/patch-creox_effects__dsp_distortionprocessor.cpp @@ -1,6 +1,6 @@ ---- creox/effects_dsp/distortionprocessor.cpp.orig +--- creox/effects_dsp/distortionprocessor.cpp.orig 2011-06-21 21:27:40 UTC +++ creox/effects_dsp/distortionprocessor.cpp -@@ -423,7 +424,8 @@ +@@ -424,7 +424,8 @@ void DistortionProcessor::computeBPFCoef { const float omega = 2.0f*float(M_PI)*centerFrequency/m_samplerate_f; float sn,cs; @@ -10,8 +10,8 @@ const float alpha = sn*sinhf(float(M_LN2/2.0)*bandwidth*(omega/sn)); const float a0 = 1.0f/(1.0f + alpha); //a0 = 1/a0 -@@ -462,7 +464,8 @@ - const float A = powf(10., gain/40.0f); +@@ -463,7 +464,8 @@ void DistortionProcessor::computeLowShel + const float A = exp10f(gain/40.0f); const float omega = 2.0f*float(M_PI)*frequency/m_samplerate_f; float sn,cs; - sincosf(omega, &sn, &cs); @@ -20,7 +20,7 @@ register const float beta = sn * sqrtf( (A*A + 1.0f)/slope - powf(A-1.0f, 2.0f) ); register const float AplusOne = A + 1.0f; -@@ -500,7 +503,8 @@ +@@ -501,7 +503,8 @@ void DistortionProcessor::computeLowPass { const float omega = 2.0f*float(M_PI)*cutoffFrequency/m_samplerate_f; float sn,cs; diff --git a/audio/creox/files/patch-creox__effects_dsp__echoprocessor.cpp b/audio/creox/files/patch-creox_effects__dsp_echoprocessor.cpp similarity index 73% rename from audio/creox/files/patch-creox__effects_dsp__echoprocessor.cpp rename to audio/creox/files/patch-creox_effects__dsp_echoprocessor.cpp index cc9bbedc391f..a012ba414873 100644 --- a/audio/creox/files/patch-creox__effects_dsp__echoprocessor.cpp +++ b/audio/creox/files/patch-creox_effects__dsp_echoprocessor.cpp @@ -1,6 +1,6 @@ ---- creox/effects_dsp/echoprocessor.cpp.orig 2011-06-22 06:27:40.000000000 +0900 -+++ creox/effects_dsp/echoprocessor.cpp 2013-02-18 21:05:56.000000000 +0900 -@@ -221,7 +221,7 @@ +--- creox/effects_dsp/echoprocessor.cpp.orig 2011-06-21 21:27:40 UTC ++++ creox/effects_dsp/echoprocessor.cpp +@@ -221,7 +221,7 @@ void EchoProcessor::signalFlow_run(const parallelEchoes += parEcho * m_parallelEchoParam[count].decay_f; #ifdef FP_FAST_FMAF *(m_parallelEchoChain[count].buffer + m_parallelEchoChain[count].offset) = diff --git a/audio/creox/files/patch-creox__effects_dsp__phaserprocessor.cpp b/audio/creox/files/patch-creox_effects__dsp_phaserprocessor.cpp similarity index 75% rename from audio/creox/files/patch-creox__effects_dsp__phaserprocessor.cpp rename to audio/creox/files/patch-creox_effects__dsp_phaserprocessor.cpp index 65df72e5c5c7..6a4940906f99 100644 --- a/audio/creox/files/patch-creox__effects_dsp__phaserprocessor.cpp +++ b/audio/creox/files/patch-creox_effects__dsp_phaserprocessor.cpp @@ -1,6 +1,6 @@ ---- creox/effects_dsp/phaserprocessor.cpp.orig +--- creox/effects_dsp/phaserprocessor.cpp.orig 2011-06-21 21:27:40 UTC +++ creox/effects_dsp/phaserprocessor.cpp -@@ -156,7 +157,8 @@ +@@ -157,7 +157,8 @@ void PhaserProcessor::signalFlow_run(con { const float omega = 2.0f * float(M_PI) * m_stepFrequency / m_samplerate_d; float sn, cs; @@ -10,7 +10,7 @@ *(m_coefBuffPrelim++) = cs; // cs *(m_coefBuffPrelim++) = sn / m_resonance; // alpha (m_resonance = 2.0*resonance) m_stepFrequency *= m_expStep; -@@ -231,7 +233,8 @@ +@@ -232,7 +233,8 @@ void PhaserProcessor::signalFlow_run(con } float sn, cs; diff --git a/audio/creox/files/patch-creox__effects_dsp__tremoloprocessor.cpp b/audio/creox/files/patch-creox_effects__dsp_tremoloprocessor.cpp similarity index 73% rename from audio/creox/files/patch-creox__effects_dsp__tremoloprocessor.cpp rename to audio/creox/files/patch-creox_effects__dsp_tremoloprocessor.cpp index 082fba08db29..966768bb3463 100644 --- a/audio/creox/files/patch-creox__effects_dsp__tremoloprocessor.cpp +++ b/audio/creox/files/patch-creox_effects__dsp_tremoloprocessor.cpp @@ -1,6 +1,6 @@ ---- creox/effects_dsp/tremoloprocessor.cpp.orig 2011-06-22 06:27:40.000000000 +0900 -+++ creox/effects_dsp/tremoloprocessor.cpp 2013-02-18 21:04:20.000000000 +0900 -@@ -182,8 +182,8 @@ +--- creox/effects_dsp/tremoloprocessor.cpp.orig 2011-06-21 21:27:40 UTC ++++ creox/effects_dsp/tremoloprocessor.cpp +@@ -182,8 +182,8 @@ void TremoloProcessor::signalFlow_run(co register const float inputSample = *(inputBuffer++) * m_inputGain_f; #ifdef FP_FAST_FMAF *(outputBuffer++) = (inputSample * m_dry_f) diff --git a/audio/csound/files/patch-InOut-rtalsa.c b/audio/csound/files/patch-InOut_rtalsa.c similarity index 60% rename from audio/csound/files/patch-InOut-rtalsa.c rename to audio/csound/files/patch-InOut_rtalsa.c index cc4c4635a1e0..df863ed7a06a 100644 --- a/audio/csound/files/patch-InOut-rtalsa.c +++ b/audio/csound/files/patch-InOut_rtalsa.c @@ -1,5 +1,5 @@ ---- InOut/rtalsa.c.orig 2011-12-22 19:41:53.000000000 +0900 -+++ InOut/rtalsa.c 2011-12-27 23:53:00.000000000 +0900 +--- InOut/rtalsa.c.orig 2013-01-07 12:49:34 UTC ++++ InOut/rtalsa.c @@ -35,9 +35,6 @@ /* #ifndef _BSD_SOURCE */ /* #define _BSD_SOURCE 1 */ diff --git a/audio/csound/files/patch-Opcodes-urandom.c b/audio/csound/files/patch-Opcodes-urandom.c deleted file mode 100644 index 7d19cb045fdd..000000000000 --- a/audio/csound/files/patch-Opcodes-urandom.c +++ /dev/null @@ -1,10 +0,0 @@ ---- Opcodes/urandom.c.old 2011-01-30 02:14:59.000000000 -0600 -+++ Opcodes/urandom.c 2011-01-30 02:15:08.000000000 -0600 -@@ -22,7 +22,6 @@ - */ - - #include "csdl.h" --#include - - typedef struct { - OPDS h; diff --git a/audio/csound/files/patch-Opcodes_urandom.c b/audio/csound/files/patch-Opcodes_urandom.c new file mode 100644 index 000000000000..3cf8554709da --- /dev/null +++ b/audio/csound/files/patch-Opcodes_urandom.c @@ -0,0 +1,10 @@ +--- Opcodes/urandom.c.orig 2013-01-07 12:49:34 UTC ++++ Opcodes/urandom.c +@@ -22,7 +22,6 @@ + */ + + #include "csdl.h" +-#include + + typedef struct { + OPDS h; diff --git a/audio/csound/files/patch-SConstruct b/audio/csound/files/patch-SConstruct index da73267d75e3..c7ee4b0b96b2 100644 --- a/audio/csound/files/patch-SConstruct +++ b/audio/csound/files/patch-SConstruct @@ -1,6 +1,6 @@ ---- SConstruct.orig 2013-01-07 16:49:34.000000000 +0400 -+++ SConstruct 2014-08-22 15:37:51.000000000 +0400 -@@ -2057,7 +2057,7 @@ +--- SConstruct.orig 2013-01-07 12:49:34 UTC ++++ SConstruct +@@ -2057,7 +2057,7 @@ else: # DSSI HOST OPCODES diff --git a/audio/csound/files/patch-Top-csound.c b/audio/csound/files/patch-Top_csound.c similarity index 84% rename from audio/csound/files/patch-Top-csound.c rename to audio/csound/files/patch-Top_csound.c index fdeab7833a8f..2c612f114dfb 100644 --- a/audio/csound/files/patch-Top-csound.c +++ b/audio/csound/files/patch-Top_csound.c @@ -1,6 +1,6 @@ ---- Top/csound.c.orig 2011-10-16 22:59:03.000000000 +0900 -+++ Top/csound.c 2011-12-07 01:15:33.000000000 +0900 -@@ -70,11 +70,14 @@ +--- Top/csound.c.orig 2013-01-07 12:49:34 UTC ++++ Top/csound.c +@@ -70,11 +70,14 @@ extern "C" { **** MAJOR PROBLEM: PTHREAD_SPINLOCK_INITIALIZER is not defined in Linux or Haiku */ @@ -16,7 +16,7 @@ #if defined(USE_OPENMP) #include #endif /* USE_OPENMP */ -@@ -430,7 +433,7 @@ +@@ -430,7 +433,7 @@ extern "C" { NULL, /* csRandState */ 0, /* randSeed1 */ 0, /* randSeed2 */ @@ -25,7 +25,7 @@ PTHREAD_SPINLOCK_INITIALIZER, /* memlock */ #else 0, /* memlock */ -@@ -2914,7 +2917,7 @@ +@@ -2914,7 +2917,7 @@ void csoundNotifyFileOpened(CSOUND *csou /* ------------------------------------ */ #if defined(HAVE_RDTSC) @@ -34,7 +34,7 @@ #undef HAVE_RDTSC #endif #endif -@@ -2927,6 +2930,12 @@ +@@ -2927,6 +2930,12 @@ static double timeResolutionSeconds = -1 static int getTimeResolution(void) { #if defined(HAVE_RDTSC) @@ -47,7 +47,7 @@ FILE *f; char buf[256]; -@@ -2967,9 +2976,14 @@ +@@ -2967,9 +2976,14 @@ static int getTimeResolution(void) } } fclose(f); diff --git a/audio/csound/files/patch-frontends_fltk_gui_CsoundPerformanceSettingsPanel.cpp b/audio/csound/files/patch-frontends_fltk__gui_CsoundPerformanceSettingsPanel.cpp similarity index 69% rename from audio/csound/files/patch-frontends_fltk_gui_CsoundPerformanceSettingsPanel.cpp rename to audio/csound/files/patch-frontends_fltk__gui_CsoundPerformanceSettingsPanel.cpp index fea6dd48a2f4..865c2c9898f9 100644 --- a/audio/csound/files/patch-frontends_fltk_gui_CsoundPerformanceSettingsPanel.cpp +++ b/audio/csound/files/patch-frontends_fltk__gui_CsoundPerformanceSettingsPanel.cpp @@ -1,5 +1,5 @@ ---- frontends/fltk_gui/CsoundPerformanceSettingsPanel.cpp.orig 2012-08-31 15:40:35.000000000 +0200 -+++ frontends/fltk_gui/CsoundPerformanceSettingsPanel.cpp 2012-10-01 23:21:42.734591150 +0200 +--- frontends/fltk_gui/CsoundPerformanceSettingsPanel.cpp.orig 2013-01-07 12:49:35 UTC ++++ frontends/fltk_gui/CsoundPerformanceSettingsPanel.cpp @@ -4,9 +4,11 @@ #endif diff --git a/audio/csound6/files/patch-H__remote.h b/audio/csound6/files/patch-H_remote.h similarity index 85% rename from audio/csound6/files/patch-H__remote.h rename to audio/csound6/files/patch-H_remote.h index 300d735180c6..d83fa52cd1f1 100644 --- a/audio/csound6/files/patch-H__remote.h +++ b/audio/csound6/files/patch-H_remote.h @@ -1,4 +1,4 @@ ---- H/remote.h.orig 2015-04-25 19:06:22 UTC +--- H/remote.h.orig 2015-09-29 11:13:27 UTC +++ H/remote.h @@ -42,7 +42,10 @@ #ifdef MACOSX diff --git a/audio/csound6/files/patch-InOut-rtalsa.c b/audio/csound6/files/patch-InOut_rtalsa.c similarity index 88% rename from audio/csound6/files/patch-InOut-rtalsa.c rename to audio/csound6/files/patch-InOut_rtalsa.c index 933b53e5f83f..7b13e67f0a43 100644 --- a/audio/csound6/files/patch-InOut-rtalsa.c +++ b/audio/csound6/files/patch-InOut_rtalsa.c @@ -1,4 +1,4 @@ ---- InOut/rtalsa.c.orig 2015-04-25 19:06:22 UTC +--- InOut/rtalsa.c.orig 2015-09-29 11:13:27 UTC +++ InOut/rtalsa.c @@ -23,6 +23,7 @@ 02111-1307 USA diff --git a/audio/csound6/files/patch-Top-csound.c b/audio/csound6/files/patch-Top_csound.c similarity index 86% rename from audio/csound6/files/patch-Top-csound.c rename to audio/csound6/files/patch-Top_csound.c index 25e11ee4875a..3d417d6ace46 100644 --- a/audio/csound6/files/patch-Top-csound.c +++ b/audio/csound6/files/patch-Top_csound.c @@ -1,4 +1,4 @@ ---- Top/csound.c.orig 2015-04-25 19:06:23 UTC +--- Top/csound.c.orig 2015-09-29 11:13:27 UTC +++ Top/csound.c @@ -60,10 +60,13 @@ #include "cs_par_dispatch.h" @@ -15,7 +15,7 @@ #if defined(USE_OPENMP) #include #endif /* USE_OPENMP */ -@@ -3495,7 +3498,7 @@ void csoundNotifyFileOpened(CSOUND* csou +@@ -3510,7 +3513,7 @@ void csoundNotifyFileOpened(CSOUND* csou /* ------------------------------------ */ #if defined(HAVE_RDTSC) @@ -24,7 +24,7 @@ #undef HAVE_RDTSC #endif #endif -@@ -3508,6 +3511,13 @@ static double timeResolutionSeconds = -1 +@@ -3523,6 +3526,13 @@ static double timeResolutionSeconds = -1 static int getTimeResolution(void) { #if defined(HAVE_RDTSC) @@ -38,7 +38,7 @@ FILE *f; char buf[256]; -@@ -3543,9 +3553,14 @@ static int getTimeResolution(void) +@@ -3558,9 +3568,14 @@ static int getTimeResolution(void) } } fclose(f); diff --git a/audio/csound6/files/patch-frontends__CsoundAC__ChordSpace.hpp b/audio/csound6/files/patch-frontends_CsoundAC_ChordSpace.hpp similarity index 88% rename from audio/csound6/files/patch-frontends__CsoundAC__ChordSpace.hpp rename to audio/csound6/files/patch-frontends_CsoundAC_ChordSpace.hpp index d67972d5fd85..0471a156f344 100644 --- a/audio/csound6/files/patch-frontends__CsoundAC__ChordSpace.hpp +++ b/audio/csound6/files/patch-frontends_CsoundAC_ChordSpace.hpp @@ -1,4 +1,4 @@ ---- frontends/CsoundAC/ChordSpace.hpp.orig 2015-04-25 19:06:23 UTC +--- frontends/CsoundAC/ChordSpace.hpp.orig 2015-09-29 11:13:28 UTC +++ frontends/CsoundAC/ChordSpace.hpp @@ -29,6 +29,7 @@ #include diff --git a/audio/csound6/files/patch-frontends__CsoundAC__Composition.cpp b/audio/csound6/files/patch-frontends_CsoundAC_Composition.cpp similarity index 95% rename from audio/csound6/files/patch-frontends__CsoundAC__Composition.cpp rename to audio/csound6/files/patch-frontends_CsoundAC_Composition.cpp index f33a5e684d6a..fa72c72c0d05 100644 --- a/audio/csound6/files/patch-frontends__CsoundAC__Composition.cpp +++ b/audio/csound6/files/patch-frontends_CsoundAC_Composition.cpp @@ -1,4 +1,4 @@ ---- frontends/CsoundAC/Composition.cpp.orig 2015-04-25 19:06:23 UTC +--- frontends/CsoundAC/Composition.cpp.orig 2015-09-29 11:13:28 UTC +++ frontends/CsoundAC/Composition.cpp @@ -22,6 +22,7 @@ #endif diff --git a/audio/csound6/files/patch-frontends__CsoundAC__Counterpoint.cpp b/audio/csound6/files/patch-frontends_CsoundAC_Counterpoint.cpp similarity index 98% rename from audio/csound6/files/patch-frontends__CsoundAC__Counterpoint.cpp rename to audio/csound6/files/patch-frontends_CsoundAC_Counterpoint.cpp index abc845af7255..46802038c0f3 100644 --- a/audio/csound6/files/patch-frontends__CsoundAC__Counterpoint.cpp +++ b/audio/csound6/files/patch-frontends_CsoundAC_Counterpoint.cpp @@ -1,4 +1,4 @@ ---- frontends/CsoundAC/Counterpoint.cpp.orig 2015-04-25 19:06:23 UTC +--- frontends/CsoundAC/Counterpoint.cpp.orig 2015-09-29 11:13:28 UTC +++ frontends/CsoundAC/Counterpoint.cpp @@ -217,8 +217,8 @@ void Counterpoint::toCsoundScore(std::st delete uniform_real_generator; diff --git a/audio/csound6/files/patch-frontends__CsoundAC__Counterpoint.hpp b/audio/csound6/files/patch-frontends_CsoundAC_Counterpoint.hpp similarity index 82% rename from audio/csound6/files/patch-frontends__CsoundAC__Counterpoint.hpp rename to audio/csound6/files/patch-frontends_CsoundAC_Counterpoint.hpp index 196e5f670006..6a4dda8f0477 100644 --- a/audio/csound6/files/patch-frontends__CsoundAC__Counterpoint.hpp +++ b/audio/csound6/files/patch-frontends_CsoundAC_Counterpoint.hpp @@ -1,4 +1,4 @@ ---- frontends/CsoundAC/Counterpoint.hpp.orig 2015-04-25 19:06:23 UTC +--- frontends/CsoundAC/Counterpoint.hpp.orig 2015-09-29 11:13:28 UTC +++ frontends/CsoundAC/Counterpoint.hpp @@ -102,8 +102,8 @@ public: Counterpoint(); diff --git a/audio/ctronome/files/patch-Makefile b/audio/ctronome/files/patch-Makefile index 1c8cad9ad2ac..58bc85c96239 100644 --- a/audio/ctronome/files/patch-Makefile +++ b/audio/ctronome/files/patch-Makefile @@ -1,7 +1,8 @@ exit--- Makefile.orig 2008-12-18 13:49:32.000000000 +0300 -+++ Makefile 2010-08-18 21:47:01.000000000 +0400 +--- Makefile.orig 2014-09-29 18:48:56 UTC ++++ Makefile @@ -1,11 +1,11 @@ - VERSION = 0.5.3 + VERSION = 0.5.5 -CC = gcc +CC ?= gcc OBJS = ctronome.o dsp.o routines.o diff --git a/audio/cutmp3/files/patch-Makefile b/audio/cutmp3/files/patch-Makefile index 8fb860c58088..01b95c0bda38 100644 --- a/audio/cutmp3/files/patch-Makefile +++ b/audio/cutmp3/files/patch-Makefile @@ -1,8 +1,8 @@ ---- ./Makefile.orig 2011-05-07 16:02:38.000000000 +0200 -+++ ./Makefile 2014-02-13 13:02:59.627899989 +0100 +--- Makefile.orig 2015-07-13 10:22:29 UTC ++++ Makefile @@ -1,42 +1,37 @@ NAME=cutmp3 - VERSION=2.0.3 + VERSION=3.0.1 -PREFIX=/usr +PREFIX?=/usr/local BINDIR=${PREFIX}/bin diff --git a/audio/dagrab/files/patch-Makefile b/audio/dagrab/files/patch-Makefile index 57b9babe4113..e13d83efb98c 100644 --- a/audio/dagrab/files/patch-Makefile +++ b/audio/dagrab/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Sat Feb 19 15:41:30 2000 -+++ Makefile Fri Apr 21 17:12:20 2000 +--- Makefile.orig 2000-02-19 15:41:30 UTC ++++ Makefile @@ -1,8 +1,8 @@ -CC=gcc +#CC=gcc diff --git a/audio/dagrab/files/patch-dagrab.c b/audio/dagrab/files/patch-dagrab.c index e61d60eca151..63dabf6cc624 100644 --- a/audio/dagrab/files/patch-dagrab.c +++ b/audio/dagrab/files/patch-dagrab.c @@ -1,5 +1,5 @@ ---- dagrab.c.orig Sat Feb 19 17:32:46 2000 -+++ dagrab.c Tue Nov 18 00:05:29 2003 +--- dagrab.c.orig 2000-02-19 16:32:46 UTC ++++ dagrab.c @@ -94,26 +94,21 @@ #include #include @@ -51,7 +51,7 @@ #define KW_TRACK 0 #define KW_FULLD 1 #define KW_AUTHOR 2 -@@ -206,16 +207,20 @@ +@@ -206,16 +207,20 @@ struct kword kwords[]={ struct Wavefile cd_newave(unsigned size) { @@ -82,7 +82,7 @@ return dummy; } -@@ -226,16 +231,16 @@ +@@ -226,16 +231,16 @@ char *resttime(int sec) return buf; } @@ -105,7 +105,7 @@ } void cd_read_audio(int lba,int num,char *buf) -@@ -244,16 +249,27 @@ +@@ -244,16 +249,27 @@ void cd_read_audio(int lba,int num,char /*NOTE: if num>CDROM_NBLOCKS_BUFFER as defined in ide_cd.c (8 in linux 2.0.32) jitter correction may be required inside the block. */ { @@ -139,7 +139,7 @@ exit(1); } } -@@ -471,7 +487,7 @@ +@@ -471,7 +487,7 @@ int cddb_main(struct cd_trk_list *tl) DIR *d; struct dirent *e; char *id2,*p,*cddb,*loc; @@ -148,7 +148,7 @@ char id[12]; char *path; char path2[500]; -@@ -645,10 +661,10 @@ +@@ -645,10 +661,10 @@ void ExpandTempl (char *templ,char *out, int cd_getinfo(char *cd_dev,struct cd_trk_list *tl) { int i; @@ -162,7 +162,7 @@ fprintf(stderr,"%s: error opening device %s\n",progname,cd_dev); exit(1); } -@@ -656,7 +672,7 @@ +@@ -656,7 +672,7 @@ int cd_getinfo(char *cd_dev,struct cd_tr fprintf(stderr,"%s: read TOC ioctl failed: %s\n",progname,strerror(errno)); exit(1); } @@ -171,7 +171,7 @@ if((tl->starts=(int *)malloc((tl->max-tl->min+2)*sizeof(int)))==NULL){ fprintf(stderr,"%s: list data allocation failed\n",progname); exit(1); -@@ -668,21 +684,21 @@ +@@ -668,21 +684,21 @@ int cd_getinfo(char *cd_dev,struct cd_tr for (i=tl->min;i<=tl->max;i++) { @@ -199,7 +199,7 @@ i=cddb_main(tl); if(i==-1) { -@@ -796,6 +812,7 @@ +@@ -796,6 +812,7 @@ int cd_read_track(char *basename,int tn, struct Wavefile header; int fd,bytes,i,n,q,space; int bcount, sc, missing, speed = 0, ldp, now; @@ -207,7 +207,7 @@ if(tnmin || tn>tl->max) return (-1); space = ((tl->starts[tn-tl->min+1]-tl->starts[tn-tl->min]) * -@@ -879,8 +896,10 @@ +@@ -879,8 +896,10 @@ int cd_read_track(char *basename,int tn, d = p1[c]; buf3[c] = ((short)(d&65535) + (short)(d>>16)) >> 1; } @@ -220,7 +220,7 @@ fprintf(stderr,"%s: error writing wave file %s: %s\n", progname,nam,strerror(errno)); exit(1); -@@ -896,7 +915,17 @@ +@@ -896,7 +915,17 @@ int cd_read_track(char *basename,int tn, /* dump last bytes */ if (bytes<(tl->starts[tn+1]-tl->starts[tn])*CD_FRAMESIZE_RAW){ n=(tl->starts[tn+1]-tl->starts[tn])*CD_FRAMESIZE_RAW-bytes; @@ -239,7 +239,7 @@ fprintf(stderr,"%s: error writing wave file %s: %s\n",progname,nam,strerror(errno)); exit(1); }; -@@ -961,7 +990,7 @@ +@@ -961,7 +990,7 @@ void usage(void) int main(int ac,char **av) { int i,l,disp_TOC=0; @@ -248,7 +248,7 @@ int all_tracks=0; struct cd_trk_list tl; char cd_dev[BLEN+1]=CDDEVICE; -@@ -969,10 +998,8 @@ +@@ -969,10 +998,8 @@ int main(int ac,char **av) char filter[BLEN+1] = ""; char path[500]; FILE *f; diff --git a/audio/deadbeef/files/patch-fft.c b/audio/deadbeef/files/patch-fft.c index 4f3695ba65f5..f74519cbaed2 100644 --- a/audio/deadbeef/files/patch-fft.c +++ b/audio/deadbeef/files/patch-fft.c @@ -1,4 +1,4 @@ ---- fft.c.orig 2014-07-12 20:30:07 UTC +--- fft.c.orig 2016-04-24 21:38:13 UTC +++ fft.c @@ -27,6 +27,10 @@ #include diff --git a/audio/deadbeef/files/patch-junklib.c b/audio/deadbeef/files/patch-junklib.c index 449e212988d9..8a22e41e61b9 100644 --- a/audio/deadbeef/files/patch-junklib.c +++ b/audio/deadbeef/files/patch-junklib.c @@ -1,4 +1,4 @@ ---- junklib.c.orig 2016-01-02 20:27:39 UTC +--- junklib.c.orig 2016-04-24 21:38:13 UTC +++ junklib.c @@ -33,7 +33,6 @@ #include diff --git a/audio/deadbeef/files/patch-plugins-ffmpeg-Makefile.in b/audio/deadbeef/files/patch-plugins_ffmpeg_Makefile.in similarity index 86% rename from audio/deadbeef/files/patch-plugins-ffmpeg-Makefile.in rename to audio/deadbeef/files/patch-plugins_ffmpeg_Makefile.in index 9cc668b14eb6..3ed8a7896c66 100644 --- a/audio/deadbeef/files/patch-plugins-ffmpeg-Makefile.in +++ b/audio/deadbeef/files/patch-plugins_ffmpeg_Makefile.in @@ -1,6 +1,6 @@ ---- plugins/ffmpeg/Makefile.in.orig 2016-01-31 20:21:50 UTC +--- plugins/ffmpeg/Makefile.in.orig 2016-04-24 21:45:48 UTC +++ plugins/ffmpeg/Makefile.in -@@ -166,11 +166,11 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top +@@ -109,11 +109,11 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f diff --git a/audio/deadbeef/files/patch-plugins-ffmpeg-ffmpeg.c b/audio/deadbeef/files/patch-plugins_ffmpeg_ffmpeg.c similarity index 89% rename from audio/deadbeef/files/patch-plugins-ffmpeg-ffmpeg.c rename to audio/deadbeef/files/patch-plugins_ffmpeg_ffmpeg.c index 1faff98b9367..003a3c18b211 100644 --- a/audio/deadbeef/files/patch-plugins-ffmpeg-ffmpeg.c +++ b/audio/deadbeef/files/patch-plugins_ffmpeg_ffmpeg.c @@ -1,4 +1,4 @@ ---- plugins/ffmpeg/ffmpeg.c.orig 2016-01-24 17:49:33 UTC +--- plugins/ffmpeg/ffmpeg.c.orig 2016-04-24 21:38:13 UTC +++ plugins/ffmpeg/ffmpeg.c @@ -26,20 +26,11 @@ #include "../../deadbeef.h" @@ -30,7 +30,7 @@ #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(54, 6, 0) #define av_find_stream_info(ctx) avformat_find_stream_info(ctx,NULL) #define avcodec_open(ctx,codec) avcodec_open2(ctx,codec,NULL) -@@ -254,7 +243,7 @@ ffmpeg_init (DB_fileinfo_t *_info, DB_pl +@@ -260,7 +249,7 @@ ffmpeg_init (DB_fileinfo_t *_info, DB_pl _info->fmt.bps = bps; _info->fmt.channels = info->ctx->channels; _info->fmt.samplerate = samplerate; @@ -39,7 +39,7 @@ _info->fmt.is_float = 1; } -@@ -326,7 +315,7 @@ ffmpeg_read (DB_fileinfo_t *_info, char +@@ -332,7 +321,7 @@ ffmpeg_read (DB_fileinfo_t *_info, char _info->fmt.channels = info->ctx->channels; _info->fmt.samplerate = info->ctx->sample_rate; _info->fmt.bps = av_get_bits_per_sample_format (info->ctx->sample_fmt); diff --git a/audio/deadbeef/files/patch-plugins_gtkui_Makefile.in b/audio/deadbeef/files/patch-plugins_gtkui_Makefile.in index 1f0f90ad5a70..3e418218fe1e 100644 --- a/audio/deadbeef/files/patch-plugins_gtkui_Makefile.in +++ b/audio/deadbeef/files/patch-plugins_gtkui_Makefile.in @@ -1,6 +1,6 @@ ---- plugins/gtkui/Makefile.in.orig 2016-03-02 16:53:16 UTC +--- plugins/gtkui/Makefile.in.orig 2016-04-24 21:45:49 UTC +++ plugins/gtkui/Makefile.in -@@ -305,7 +305,7 @@ am__objects_5 = ddb_gui_GTK3_la-gtkui.lo +@@ -260,7 +260,7 @@ am__objects_5 = ddb_gui_GTK3_la-gtkui.lo @HAVE_GTK3_TRUE@am_ddb_gui_GTK3_la_OBJECTS = $(am__objects_7) ddb_gui_GTK3_la_OBJECTS = $(am_ddb_gui_GTK3_la_OBJECTS) ddb_gui_GTK3_la_LINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ diff --git a/audio/decibel-audio-player/files/patch-Makefile b/audio/decibel-audio-player/files/patch-Makefile index 4fb56f7d7208..c1e38c2df937 100644 --- a/audio/decibel-audio-player/files/patch-Makefile +++ b/audio/decibel-audio-player/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2010-06-27 11:29:12.000000000 +0200 -+++ Makefile 2010-09-17 20:28:10.000000000 +0200 -@@ -8,7 +8,7 @@ +--- Makefile.orig 2011-09-19 10:09:26 UTC ++++ Makefile +@@ -8,7 +8,7 @@ prefix ?= /usr/local PREFIX = $(DESTDIR)$(prefix) BINDIR = $(PREFIX)/bin @@ -9,9 +9,9 @@ DATADIR = $(PREFIX)/share/decibel-audio-player SRCDIR = $(DATADIR)/src PIXDIR = $(DATADIR)/pix -@@ -20,7 +20,7 @@ +@@ -20,7 +20,7 @@ LOCALEDIR = $(PREFIX)/share/locale - CONFIGURE_IN = sed -e 's!prefix!$(prefix)!g' + CONFIGURE_IN = sed -e 's!prefix!$(PREFIX)!g' -LANGUAGES = `find locale/ -maxdepth 1 -mindepth 1 -type d -printf "%f "` +LANGUAGES = `cd locale/ && find . -maxdepth 1 -mindepth 1 -type d | tr -d ./` diff --git a/audio/decibel-audio-player/files/patch-src__modules__Covers.py b/audio/decibel-audio-player/files/patch-src_modules_Covers.py similarity index 77% rename from audio/decibel-audio-player/files/patch-src__modules__Covers.py rename to audio/decibel-audio-player/files/patch-src_modules_Covers.py index f0f7a137e3fd..47ae9ce907eb 100644 --- a/audio/decibel-audio-player/files/patch-src__modules__Covers.py +++ b/audio/decibel-audio-player/files/patch-src_modules_Covers.py @@ -1,6 +1,6 @@ ---- src/modules/Covers.py.orig 2014-10-07 12:26:08 UTC +--- src/modules/Covers.py.orig 2011-09-19 10:09:25 UTC +++ src/modules/Covers.py -@@ -124,7 +124,7 @@ +@@ -124,7 +124,7 @@ class Covers(modules.ThreadedModule): def generateFullSizeCover(self, inFile, outFile, format): """ Resize inFile if needed, and write it to outFile (outFile and inFile may be equal) """ @@ -9,7 +9,7 @@ try: # Open the image -@@ -144,7 +144,7 @@ +@@ -144,7 +144,7 @@ class Covers(modules.ThreadedModule): def generateThumbnail(self, inFile, outFile, format): """ Generate a thumbnail from inFile (e.g., resize it) and write it to outFile (outFile and inFile may be equal) """ diff --git a/audio/dekagen/files/patch-dekagen b/audio/dekagen/files/patch-dekagen index 1c9c6638521d..00daee4cc803 100644 --- a/audio/dekagen/files/patch-dekagen +++ b/audio/dekagen/files/patch-dekagen @@ -1,6 +1,6 @@ ---- dekagen.orig Sat Jul 19 13:00:19 2003 -+++ dekagen Tue Aug 12 23:02:30 2003 -@@ -42,7 +42,8 @@ +--- dekagen.orig 2004-06-15 21:58:54 UTC ++++ dekagen +@@ -42,7 +42,8 @@ ID3TOOL='built-in' # ID3 tagging tool ( BITRATE='128' # MP3/Ogg nominal encoding bitrate (KBits) METHOD='manual' # 'manual' or 'cddb' XMCDLIB='' # $XMCD_LIBDIR diff --git a/audio/dream/files/patch-src__linux__pa_shm_ringbuffer.c b/audio/dream/files/patch-src_linux_pa__shm__ringbuffer.c similarity index 100% rename from audio/dream/files/patch-src__linux__pa_shm_ringbuffer.c rename to audio/dream/files/patch-src_linux_pa__shm__ringbuffer.c diff --git a/audio/dream/files/patch-src_matlib_MatlibStdToolbox.cpp b/audio/dream/files/patch-src_matlib_MatlibStdToolbox.cpp index 54051f487325..92901770436e 100644 --- a/audio/dream/files/patch-src_matlib_MatlibStdToolbox.cpp +++ b/audio/dream/files/patch-src_matlib_MatlibStdToolbox.cpp @@ -1,4 +1,4 @@ ---- src/matlib/MatlibStdToolbox.cpp.orig 2016-02-26 02:12:16 UTC +--- src/matlib/MatlibStdToolbox.cpp.orig 2013-11-11 16:33:40 UTC +++ src/matlib/MatlibStdToolbox.cpp @@ -28,11 +28,11 @@ #include "MatlibStdToolbox.h" diff --git a/audio/dream/files/patch-src__sound__pa_ringbuffer.c b/audio/dream/files/patch-src_sound_pa__ringbuffer.c similarity index 100% rename from audio/dream/files/patch-src__sound__pa_ringbuffer.c rename to audio/dream/files/patch-src_sound_pa__ringbuffer.c diff --git a/audio/dtmfdial/files/patch-dial.c b/audio/dtmfdial/files/patch-dial.c index 4530d6a3327c..7342f45da13c 100644 --- a/audio/dtmfdial/files/patch-dial.c +++ b/audio/dtmfdial/files/patch-dial.c @@ -1,5 +1,5 @@ ---- dial.c.orig Fri Mar 31 04:44:07 2006 -+++ dial.c Fri Mar 31 04:44:23 2006 +--- dial.c.orig 1998-03-20 16:13:44 UTC ++++ dial.c @@ -7,10 +7,10 @@ #include #include @@ -13,7 +13,7 @@ #define DEBUG(x) -@@ -130,7 +130,7 @@ +@@ -130,7 +130,7 @@ getvalue(int *arg, int *index, int argc, ++*index; } diff --git a/audio/dumb/files/patch-Makefile b/audio/dumb/files/patch-Makefile index ef6504759578..9a351d03ccac 100644 --- a/audio/dumb/files/patch-Makefile +++ b/audio/dumb/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 2005-08-08 04:18:41.000000000 +0400 -+++ Makefile 2008-06-12 06:27:26.000000000 +0400 +--- Makefile.orig 2005-08-08 00:18:41 UTC ++++ Makefile @@ -22,7 +22,7 @@ # (Note that this is unable to delete the dumbask # executable if the configuration is absent.) @@ -9,7 +9,7 @@ .PHONY: all install uninstall clean veryclean distclean config config-if-necessary make-outdirs -@@ -36,12 +36,12 @@ +@@ -36,12 +36,12 @@ PHONY_TARGETS := core allegro core-examp COMMA := , ifdef USE_ICC @@ -25,7 +25,7 @@ endif endif AR := ar -@@ -215,24 +215,21 @@ +@@ -215,24 +215,21 @@ make-outdirs: ifdef USE_ICC WFLAGS := -Wall -DDUMB_DECLARE_DEPRECATED WFLAGS_ALLEGRO := @@ -55,7 +55,7 @@ LDFLAGS := -s -@@ -251,8 +248,8 @@ +@@ -251,8 +248,8 @@ CORE_LIB_FILE_DEBUG := $(LIBDIR)/libdumb ALLEGRO_LIB_FILE_DEBUG := $(LIBDIR)/libaldmd.a @@ -66,7 +66,7 @@ core-examples: $(CORE_EXAMPLES_EXE) allegro-examples: $(ALLEGRO_EXAMPLES_EXE) -@@ -263,11 +260,9 @@ +@@ -263,11 +260,9 @@ allegro-headers: install-core: core $(call COPY,$(CORE_LIB_FILE_RELEASE),$(LIB_INSTALL_PATH)) @@ -78,7 +78,7 @@ ifeq "$(COMSPEC)" "" install-core-examples: core-examples -@@ -321,12 +316,6 @@ +@@ -321,12 +316,6 @@ CORE_LIB_FILE := $(LIBDIR)/libdumb.a ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmb.a include make/Makefile.inc diff --git a/audio/ecasound/files/patch-ecasound_eca-curses.cpp b/audio/ecasound/files/patch-ecasound_eca-curses.cpp index 00befbf3a6ea..325eb2addb01 100644 --- a/audio/ecasound/files/patch-ecasound_eca-curses.cpp +++ b/audio/ecasound/files/patch-ecasound_eca-curses.cpp @@ -1,4 +1,4 @@ ---- ecasound/eca-curses.cpp.orig 2009-04-11 09:44:06.000000000 +0000 +--- ecasound/eca-curses.cpp.orig 2009-04-11 09:44:06 UTC +++ ecasound/eca-curses.cpp @@ -27,6 +27,7 @@ #include diff --git a/audio/epos-devel/files/patch-configure b/audio/epos-devel/files/patch-configure index 9698d407bee8..50fba6a53b5a 100644 --- a/audio/epos-devel/files/patch-configure +++ b/audio/epos-devel/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig +--- configure.orig 2006-03-24 00:05:11 UTC +++ configure -@@ -14021,9 +14021,9 @@ +@@ -14021,9 +14021,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #ifdef HAVE_SYS_SOCKET_H diff --git a/audio/epos-devel/files/patch-src_epos.h b/audio/epos-devel/files/patch-src_epos.h index 0e2e909242e0..bab867bd93aa 100644 --- a/audio/epos-devel/files/patch-src_epos.h +++ b/audio/epos-devel/files/patch-src_epos.h @@ -1,4 +1,4 @@ ---- src/epos.h.orig +--- src/epos.h.orig 2005-04-15 00:26:11 UTC +++ src/epos.h @@ -43,6 +43,7 @@ #include diff --git a/audio/epos-devel/files/patch-src__nnet__map.h b/audio/epos-devel/files/patch-src_nnet_map.h similarity index 56% rename from audio/epos-devel/files/patch-src__nnet__map.h rename to audio/epos-devel/files/patch-src_nnet_map.h index 17fb6bdf7d8b..f63601c4ff6c 100644 --- a/audio/epos-devel/files/patch-src__nnet__map.h +++ b/audio/epos-devel/files/patch-src_nnet_map.h @@ -1,6 +1,6 @@ ---- src/nnet/map.h.orig +--- src/nnet/map.h.orig 2004-08-30 22:32:41 UTC +++ src/nnet/map.h -@@ -25,7 +25,7 @@ +@@ -25,7 +25,7 @@ T2 & TMap::operator [] (const T1 else { TData x; x.first() = key; diff --git a/audio/epos-devel/files/patch-src__nnet__neural_parse.yy b/audio/epos-devel/files/patch-src_nnet_neural__parse.yy similarity index 92% rename from audio/epos-devel/files/patch-src__nnet__neural_parse.yy rename to audio/epos-devel/files/patch-src_nnet_neural__parse.yy index 6aa31356965e..11f20eb0a72c 100644 --- a/audio/epos-devel/files/patch-src__nnet__neural_parse.yy +++ b/audio/epos-devel/files/patch-src_nnet_neural__parse.yy @@ -1,4 +1,4 @@ ---- src/nnet/neural_parse.yy.orig +--- src/nnet/neural_parse.yy.orig 2004-02-15 18:19:09 UTC +++ src/nnet/neural_parse.yy @@ -104,7 +104,7 @@ make_tree (TTypedValue val = TTypedValue /* SYMBOLS */ @@ -17,4 +17,4 @@ + shriek (812, fmt ("BISON:yyerror:bison_nnet parser: bison_row %i (not counting empty rows) '%s' is erroneous. %s\n", row_num, bison_row_buf.c_str(), s)); return -1; } - + diff --git a/audio/esound/files/patch-audio_oss.c b/audio/esound/files/patch-audio__oss.c similarity index 100% rename from audio/esound/files/patch-audio_oss.c rename to audio/esound/files/patch-audio__oss.c diff --git a/audio/espeak/files/patch-src__Makefile b/audio/espeak/files/patch-src_Makefile similarity index 100% rename from audio/espeak/files/patch-src__Makefile rename to audio/espeak/files/patch-src_Makefile diff --git a/audio/espeak/files/patch-src__speech.h b/audio/espeak/files/patch-src_speech.h similarity index 66% rename from audio/espeak/files/patch-src__speech.h rename to audio/espeak/files/patch-src_speech.h index 8949bfc66fef..94c588871169 100644 --- a/audio/espeak/files/patch-src__speech.h +++ b/audio/espeak/files/patch-src_speech.h @@ -1,6 +1,6 @@ ---- ./src/speech.h.orig 2011-03-15 15:01:33.000000000 +0100 -+++ ./src/speech.h 2011-03-18 10:12:28.000000000 +0100 -@@ -57,7 +57,7 @@ +--- src/speech.h.orig 2014-03-04 16:47:15 UTC ++++ src/speech.h +@@ -58,7 +58,7 @@ // will look for espeak_data directory here, and also in user's home directory #ifndef PATH_ESPEAK_DATA diff --git a/audio/extace/files/patch-src__color_win.c b/audio/extace/files/patch-src_color__win.c similarity index 88% rename from audio/extace/files/patch-src__color_win.c rename to audio/extace/files/patch-src_color__win.c index b6b743ad250e..a35cc40ba8d2 100644 --- a/audio/extace/files/patch-src__color_win.c +++ b/audio/extace/files/patch-src_color__win.c @@ -1,6 +1,6 @@ ---- src/color_win.c.orig Wed Feb 26 01:22:19 2003 -+++ src/color_win.c Fri May 23 18:26:18 2003 -@@ -579,12 +579,12 @@ +--- src/color_win.c.orig 2008-01-22 23:59:52 UTC ++++ src/color_win.c +@@ -620,12 +620,12 @@ void grad_win_create() button = gtk_button_new_with_label("Set Color"); gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0); gtk_signal_connect(GTK_OBJECT(button), "clicked", @@ -15,7 +15,7 @@ hbox = gtk_hbox_new(TRUE,0); gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,0); -@@ -592,12 +592,12 @@ +@@ -633,12 +633,12 @@ void grad_win_create() button = gtk_button_new_with_label("Save"); gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0); gtk_signal_connect(GTK_OBJECT(button), "clicked", diff --git a/audio/faac/files/patch-configure.in b/audio/faac/files/patch-configure.in index 84197eadf8ee..4bcd4d66738e 100644 --- a/audio/faac/files/patch-configure.in +++ b/audio/faac/files/patch-configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig 2010-08-18 15:41:30.584845747 +0300 -+++ configure.in 2010-08-18 15:42:51.184443581 +0300 +--- configure.in.orig 2009-02-05 00:55:38 UTC ++++ configure.in @@ -1,7 +1,7 @@ AC_PREREQ(2.50) AC_INIT(FAAC, 1.28, faac-dev@lists.sourceforge.net) diff --git a/audio/faac/files/patch-frontend_Makefile.am b/audio/faac/files/patch-frontend_Makefile.am index 56fe905cd48d..c49d149144fa 100644 --- a/audio/faac/files/patch-frontend_Makefile.am +++ b/audio/faac/files/patch-frontend_Makefile.am @@ -1,5 +1,5 @@ ---- frontend/Makefile.am.orig 2010-08-18 15:43:04.246728673 +0300 -+++ frontend/Makefile.am 2010-08-18 15:45:44.922966543 +0300 +--- frontend/Makefile.am.orig 2008-12-16 00:56:00 UTC ++++ frontend/Makefile.am @@ -7,6 +7,11 @@ if WITH_MP4V2 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2 LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++ diff --git a/audio/faad/files/patch-frontend_main.c b/audio/faad/files/patch-frontend_main.c index 3f06e3d08a97..6050cc55ad73 100644 --- a/audio/faad/files/patch-frontend_main.c +++ b/audio/faad/files/patch-frontend_main.c @@ -1,6 +1,6 @@ ---- frontend/main.c.orig +--- frontend/main.c.orig 2008-09-22 17:55:09 UTC +++ frontend/main.c -@@ -137,6 +137,31 @@ +@@ -137,6 +137,31 @@ static void advance_buffer(aac_buffer *b b->bytes_into_buffer = 0; } @@ -32,7 +32,7 @@ static int adts_sample_rates[] = {96000,88200,64000,48000,44100,32000,24000,22050,16000,12000,11025,8000,7350,0,0,0}; static int adts_parse(aac_buffer *b, int *bitrate, float *length) -@@ -424,6 +449,8 @@ +@@ -424,6 +449,8 @@ static int decodeAACfile(char *aacfile, float length = 0; int first_time = 1; @@ -41,7 +41,7 @@ aac_buffer b; -@@ -439,17 +466,39 @@ +@@ -439,17 +466,39 @@ static int decodeAACfile(char *aacfile, } } @@ -89,7 +89,7 @@ if (!(b.buffer = (unsigned char*)malloc(FAAD_MIN_STREAMSIZE*MAX_CHANNELS))) { -@@ -494,19 +543,39 @@ +@@ -494,19 +543,39 @@ static int decodeAACfile(char *aacfile, /* get AAC infos for printing */ header_type = 0; @@ -139,7 +139,7 @@ header_type = 1; } else if (memcmp(b.buffer, "ADIF", 4) == 0) { -@@ -538,7 +607,8 @@ +@@ -538,7 +607,8 @@ static int decodeAACfile(char *aacfile, if (b.buffer) free(b.buffer); NeAACDecClose(hDecoder); @@ -149,7 +149,7 @@ return 1; } advance_buffer(&b, bread); -@@ -564,7 +634,8 @@ +@@ -564,7 +634,8 @@ static int decodeAACfile(char *aacfile, if (infoOnly) { NeAACDecClose(hDecoder); @@ -159,7 +159,7 @@ if (b.buffer) free(b.buffer); return 0; -@@ -621,7 +692,8 @@ +@@ -621,7 +692,8 @@ static int decodeAACfile(char *aacfile, if (b.buffer) free(b.buffer); NeAACDecClose(hDecoder); @@ -169,7 +169,7 @@ return 0; } } else { -@@ -662,7 +734,8 @@ +@@ -662,7 +734,8 @@ static int decodeAACfile(char *aacfile, fclose(adtsFile); } @@ -179,7 +179,7 @@ if (!first_time && !adts_out) close_audio_file(aufile); -@@ -750,6 +823,11 @@ +@@ -750,6 +823,11 @@ static int decodeMP4file(char *mp4file, /* initialise the callback structure */ mp4ff_callback_t *mp4cb = malloc(sizeof(mp4ff_callback_t)); @@ -191,7 +191,7 @@ mp4File = fopen(mp4file, "rb"); mp4cb->read = read_callback; mp4cb->seek = seek_callback; -@@ -1016,6 +1094,7 @@ +@@ -1016,6 +1094,7 @@ int main(int argc, char *argv[]) int result; int infoOnly = 0; int writeToStdio = 0; @@ -199,7 +199,7 @@ int object_type = LC; int def_srate = 0; int downMatrix = 0; -@@ -1229,15 +1308,30 @@ +@@ -1229,15 +1308,30 @@ int main(int argc, char *argv[]) } /* check for mp4 file */ @@ -237,7 +237,7 @@ if (header[4] == 'f' && header[5] == 't' && header[6] == 'y' && header[7] == 'p') mp4file = 1; -@@ -1246,6 +1340,18 @@ +@@ -1246,6 +1340,18 @@ int main(int argc, char *argv[]) result = decodeMP4file(aacFileName, audioFileName, adtsFileName, writeToStdio, outputFormat, format, downMatrix, noGapless, infoOnly, adts_out, &length); } else { diff --git a/audio/faad/files/patch-libfaad_cfft.c b/audio/faad/files/patch-libfaad_cfft.c index 378efde77805..59c50990578f 100644 --- a/audio/faad/files/patch-libfaad_cfft.c +++ b/audio/faad/files/patch-libfaad_cfft.c @@ -1,5 +1,5 @@ ---- libfaad/cfft.c.orig 2009-03-24 23:36:45.000000000 -0400 -+++ libfaad/cfft.c 2009-03-24 23:37:25.000000000 -0400 +--- libfaad/cfft.c.orig 2007-11-01 12:33:29 UTC ++++ libfaad/cfft.c @@ -60,8 +60,8 @@ static void passf4neg(const uint16_t ido static void passf5(const uint16_t ido, const uint16_t l1, const complex_t *cc, complex_t *ch, const complex_t *wa1, const complex_t *wa2, const complex_t *wa3, diff --git a/audio/fapg/files/patch-fapg.c b/audio/fapg/files/patch-fapg.c index f2489153136d..037c2601855f 100644 --- a/audio/fapg/files/patch-fapg.c +++ b/audio/fapg/files/patch-fapg.c @@ -1,5 +1,5 @@ ---- fapg.c 2015-02-02 13:27:58.000000000 -0500 -+++ fapg.c 2015-02-03 09:47:00.000000000 -0500 +--- fapg.c.orig 2015-02-02 18:27:58 UTC ++++ fapg.c @@ -57,27 +57,27 @@ int debug = 0; @@ -40,7 +40,7 @@ int duration; #define MP2ENC 1 #define MP3ENC 2 -@@ -87,7 +87,7 @@ +@@ -87,7 +87,7 @@ int duration; #define WAVENC 6 #define WMAENC 7 @@ -49,7 +49,7 @@ "audio/mpeg", "audio/mpeg", "audio/mpeg", "audio/mpeg", "audio/ogg-vorbis", "audio/x-wav", -@@ -95,7 +95,7 @@ +@@ -95,7 +95,7 @@ char *magic[] = { NULL, NULL }; @@ -58,7 +58,7 @@ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 70, 35, 36, 37, 38, 39, 40, 41, 82, 43, 44, 45, 46, 47, -@@ -126,7 +126,7 @@ +@@ -126,7 +126,7 @@ unsigned char unix2dos[] = unsigned char *basemap; unsigned char *winorunix; @@ -67,7 +67,7 @@ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -@@ -160,7 +160,7 @@ +@@ -160,7 +160,7 @@ unsigned char one2one[] = 248, 249, 250, 251, 252, 253, 254, 255 }; /* identical mapping */ @@ -76,7 +76,7 @@ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -@@ -194,7 +194,7 @@ +@@ -194,7 +194,7 @@ unsigned char noand[256] = 248, 249, 250, 251, 252, 253, 254, 255 }; /* only '&' is mapped to '+' */ @@ -85,7 +85,7 @@ "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09", "%0a", "%0b", "%0c", "%0d", "%0e", "%0f", "%10", "%11", "%12", "%13", "%14", "%15", "%16", "%17", -@@ -308,7 +308,7 @@ +@@ -308,7 +308,7 @@ void txxputnameoffset(const char *c) int pos = 0; int cnt = 0; char b; @@ -94,7 +94,7 @@ prefx = prefix; -@@ -344,7 +344,7 @@ +@@ -344,7 +344,7 @@ void txxputstr(const char *c) { int cnt = 0; int pos; @@ -103,7 +103,7 @@ txxputnameoffset(c); -@@ -669,7 +669,7 @@ +@@ -669,7 +669,7 @@ void parse_options(int argc, char **argv } } @@ -112,7 +112,7 @@ { int bitrates[2][3][15] = { {{0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, -@@ -683,7 +683,7 @@ +@@ -683,7 +683,7 @@ void parse_mp3(unsigned char *file) {0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160}} }; FILE *fic; @@ -121,7 +121,7 @@ int lus; genre = 0; -@@ -773,7 +773,7 @@ +@@ -773,7 +773,7 @@ void parse_mp3(unsigned char *file) } while(c < buffer + lus - 10) { @@ -130,7 +130,7 @@ int version; int lay; int bitrate_index; -@@ -823,10 +823,10 @@ +@@ -823,10 +823,10 @@ void parse_mp3(unsigned char *file) fclose(fic); } @@ -143,7 +143,7 @@ int lus; int sample_rate; int samples; -@@ -911,10 +911,10 @@ +@@ -911,10 +911,10 @@ void parse_ogg(unsigned char *file) fclose(fic); } @@ -156,7 +156,7 @@ int lus; int sample_rates[4] = { 44100, 48000, 37800, 32000 }; int frame_count; -@@ -1253,9 +1253,9 @@ +@@ -1253,9 +1253,9 @@ char * xml_escape_malloc(const char * in } #endif @@ -168,7 +168,7 @@ int j, encoding = 0; for(j = 0; j < 5; j++) -@@ -1457,11 +1457,11 @@ +@@ -1457,11 +1457,11 @@ void parse_file(unsigned char *newpath, } } @@ -182,7 +182,7 @@ struct stat infos; if(debug) -@@ -1520,8 +1520,7 @@ +@@ -1520,8 +1520,7 @@ int main(int argc, char **argv) break; case FORMAT_HTML: printf @@ -192,7 +192,7 @@ "%s%s%s%s%s%s%s

Playlist

%s%s%s%s", eol, eol, eol, eol, eol, eol, eol, eol, eol, eol, eol, eol, eol, eol, eol, eol, eol, eol, eol, eol, eol, eol, eol, eol, -@@ -1538,10 +1537,8 @@ +@@ -1538,10 +1537,8 @@ int main(int argc, char **argv) strftime(timebuffer, 255, "%a %d %b %Y %T %z", localtime(&zeit)); printf @@ -205,7 +205,7 @@ "%s\t%s\t\t%s/podcast.jpg%s\t\tServer Logo%s\t\t%s%s\t\tFeed provided by FAPG. Click to visit.%s\t%s\t%s\t\tAdmin %s%s\t\tpodcast@%s%s\t%s\tVarious%s\tDirectory Tree %s%s\t%s%s\tunknown%s\t%s%s\tNo%s\t1800%s", eol, eol, eol, eol, hostname, dir, argv[optind], eol, prefix, eol, base, eol, prefix, eol, timebuffer, eol, eol, -@@ -1566,7 +1563,7 @@ +@@ -1566,7 +1563,7 @@ int main(int argc, char **argv) #ifdef HAVE_LIBURIPARSER case FORMAT_XSPF: printf("\n" @@ -214,7 +214,7 @@ "\n" "\n"); break; -@@ -1581,7 +1578,7 @@ +@@ -1581,7 +1578,7 @@ int main(int argc, char **argv) sprintf(pwd, "%s/", pwd_source); if(fromstdin) { @@ -223,7 +223,7 @@ int i; while(fgets(path, PATH_MAX, stdin)) { for(i = 0; i < PATH_MAX; i++) -@@ -1621,7 +1618,7 @@ +@@ -1621,7 +1618,7 @@ int main(int argc, char **argv) case FORMAT_HTML: printf ("
EntryArtistTitleLength
%s%s

Playlist generated by FAPG " diff --git a/audio/fcplay/files/patch-AudioDriver.h b/audio/fcplay/files/patch-AudioDriver.h index 9c9bc3f692d5..afc0c009d9c7 100644 --- a/audio/fcplay/files/patch-AudioDriver.h +++ b/audio/fcplay/files/patch-AudioDriver.h @@ -1,5 +1,5 @@ ---- AudioDriver.h.orig Mon Mar 3 21:47:00 1997 -+++ AudioDriver.h Sun May 18 11:12:48 2003 +--- AudioDriver.h.orig 1997-03-03 21:47:00 UTC ++++ AudioDriver.h @@ -7,14 +7,15 @@ #include #include diff --git a/audio/fcplay/files/patch-Dump.h b/audio/fcplay/files/patch-Dump.h index 743838a73bcd..c440a1442bf9 100644 --- a/audio/fcplay/files/patch-Dump.h +++ b/audio/fcplay/files/patch-Dump.h @@ -1,5 +1,5 @@ ---- Dump.h.orig Mon Mar 3 22:47:00 1997 -+++ Dump.h Tue Jun 6 20:05:48 2006 +--- Dump.h.orig 1997-03-03 21:47:00 UTC ++++ Dump.h @@ -2,8 +2,9 @@ #define DUMP_H diff --git a/audio/fcplay/files/patch-Main.cpp b/audio/fcplay/files/patch-Main.cpp index 81e7437579ca..05fd9ccda137 100644 --- a/audio/fcplay/files/patch-Main.cpp +++ b/audio/fcplay/files/patch-Main.cpp @@ -1,5 +1,5 @@ ---- Main.cpp.orig Mon Mar 3 22:47:00 1997 -+++ Main.cpp Tue Jun 6 21:05:07 2006 +--- Main.cpp.orig 1997-03-03 21:47:00 UTC ++++ Main.cpp @@ -1,8 +1,11 @@ -#include +#include @@ -14,7 +14,7 @@ #include "FC.h" #include "MyTypes.h" -@@ -95,11 +98,7 @@ +@@ -95,11 +98,7 @@ int main(int argc, char *argv[]) streampos fileLen = 0; // open binary input file stream at end of file @@ -27,7 +27,7 @@ // As a replacement for !is_open(), bad() and the NOT-operator don't seem // to work on all systems. #if defined(DONT_HAVE_IS_OPEN) -@@ -119,20 +118,20 @@ +@@ -119,20 +118,20 @@ int main(int argc, char *argv[]) fileLen = (udword)myIn.tellg(); #endif fileLen = myIn.tellg(); @@ -51,7 +51,7 @@ cout << "." << flush; } cout << endl << flush; -@@ -147,7 +146,7 @@ +@@ -147,7 +146,7 @@ int main(int argc, char *argv[]) extern udword pcmFreq; pcmFreq = 44100; diff --git a/audio/fcplay/files/patch-POINTER b/audio/fcplay/files/patch-POINTER index ff78b8fb0f9e..425ba30527c0 100644 --- a/audio/fcplay/files/patch-POINTER +++ b/audio/fcplay/files/patch-POINTER @@ -1,5 +1,5 @@ ---- POINTER.old Sun Sep 17 22:27:38 2000 -+++ POINTER Sun Sep 17 22:27:45 2000 +--- POINTER.orig 1997-03-03 21:47:00 UTC ++++ POINTER @@ -1,3 +1,3 @@ http://www.geocities.com/SiliconValley/Lakes/5147/mod/ diff --git a/audio/fcplay/files/patch-SmartPtr.h b/audio/fcplay/files/patch-SmartPtr.h index adc6549afc34..c21b728763ed 100644 --- a/audio/fcplay/files/patch-SmartPtr.h +++ b/audio/fcplay/files/patch-SmartPtr.h @@ -1,6 +1,6 @@ ---- SmartPtr.h.orig Tue Jun 6 20:00:27 2006 -+++ SmartPtr.h Tue Jun 6 20:00:38 2006 -@@ -207,16 +207,16 @@ +--- SmartPtr.h.orig 1998-11-30 19:10:00 UTC ++++ SmartPtr.h +@@ -207,16 +207,16 @@ class smartPtr : public smartPtrBase { if ( bufferLen >= 1 ) { diff --git a/audio/fcplay/files/patch-configure b/audio/fcplay/files/patch-configure index 4f5069de86c4..f9edfc16f53f 100644 --- a/audio/fcplay/files/patch-configure +++ b/audio/fcplay/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Thu May 28 04:08:00 1998 -+++ configure Tue Dec 12 02:51:01 2000 -@@ -1631,41 +1631,6 @@ +--- configure.orig 1998-05-27 19:08:00 UTC ++++ configure +@@ -1631,41 +1631,6 @@ fi fi; @@ -42,7 +42,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -@@ -2297,4 +2262,3 @@ +@@ -2297,4 +2262,3 @@ rm -fr confdefs* $ac_clean_files test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 diff --git a/audio/festalon/files/patch-src__cputest.c b/audio/festalon/files/patch-src_cputest.c similarity index 90% rename from audio/festalon/files/patch-src__cputest.c rename to audio/festalon/files/patch-src_cputest.c index 313a06a7d842..c124c1c9eae9 100644 --- a/audio/festalon/files/patch-src__cputest.c +++ b/audio/festalon/files/patch-src_cputest.c @@ -1,6 +1,6 @@ ---- ./src/cputest.c.orig 2005-02-28 01:26:01.000000000 +0100 -+++ ./src/cputest.c 2010-09-28 11:21:52.000000000 +0200 -@@ -31,18 +31,33 @@ +--- src/cputest.c.orig 2005-02-28 00:26:01 UTC ++++ src/cputest.c +@@ -31,18 +31,33 @@ static int mm_support(void) { #ifdef ARCH_X86 int rval; @@ -36,7 +36,7 @@ "movl %0, %1\n\t" /* ... Toggle the ID bit in one copy and store */ -@@ -53,9 +68,6 @@ +@@ -53,9 +68,6 @@ static int mm_support(void) /* ... Get the (hopefully modified) EFLAGS */ "pushf\n\t" diff --git a/audio/festalon/files/patch-src__filter.h b/audio/festalon/files/patch-src_filter.h similarity index 65% rename from audio/festalon/files/patch-src__filter.h rename to audio/festalon/files/patch-src_filter.h index d8796d68c072..4087949be93c 100644 --- a/audio/festalon/files/patch-src__filter.h +++ b/audio/festalon/files/patch-src_filter.h @@ -1,6 +1,6 @@ ---- ./src/filter.h.orig 2010-09-28 11:22:11.000000000 +0200 -+++ ./src/filter.h 2010-09-28 11:22:33.000000000 +0200 -@@ -20,6 +20,8 @@ +--- src/filter.h.orig 2005-02-27 23:39:24 UTC ++++ src/filter.h +@@ -20,6 +20,8 @@ typedef struct { #ifdef ARCH_X86 int16 coeffs_i16[NCOEFFS] __attribute__ ((aligned (8))); diff --git a/audio/festdoc/files/patch-festival_info_festival.info b/audio/festdoc/files/patch-festival_info_festival.info index bcaeeaea3c3d..49b7133fa024 100644 --- a/audio/festdoc/files/patch-festival_info_festival.info +++ b/audio/festdoc/files/patch-festival_info_festival.info @@ -1,7 +1,7 @@ $NetBSD: patch-aa,v 1.1 2000/01/06 01:40:11 wiz Exp $ ---- festival/info/festival.info.orig Sat Jun 19 17:08:03 1999 -+++ festival/info/festival.info Wed Jan 5 16:36:08 2000 +--- festival/info/festival.info.orig 1999-06-19 15:08:03 UTC ++++ festival/info/festival.info @@ -1,6 +1,11 @@ This is Info file festival.info, produced by Makeinfo-1.63 from the input file festival.texi. diff --git a/audio/festlex-czech/files/patch-Makefile b/audio/festlex-czech/files/patch-Makefile index b1c264ddac3f..04f6a23546f0 100644 --- a/audio/festlex-czech/files/patch-Makefile +++ b/audio/festlex-czech/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig Wed Jun 21 09:32:07 2006 -+++ Makefile Wed Dec 26 16:42:28 2007 -@@ -36,10 +36,9 @@ +--- Makefile.orig 2006-06-21 07:32:07 UTC ++++ Makefile +@@ -36,10 +36,9 @@ distfiles := *.scm *.out all: czech-lexicon.out %.out: %.scm diff --git a/audio/festlex-czech/files/patch-czech-lexicon.out b/audio/festlex-czech/files/patch-czech-lexicon.out index da80f6a04796..f7f38f141736 100644 --- a/audio/festlex-czech/files/patch-czech-lexicon.out +++ b/audio/festlex-czech/files/patch-czech-lexicon.out @@ -1,6 +1,6 @@ ---- czech-lexicon.out.orig Wed Dec 26 17:22:12 2007 -+++ czech-lexicon.out Wed Dec 26 17:28:09 2007 -@@ -45,7 +45,9 @@ +--- czech-lexicon.out.orig 2006-06-21 07:32:07 UTC ++++ czech-lexicon.out +@@ -45,7 +45,9 @@ MNCL ("a" nil (((a) 0))) ("a" sym (((a:) 0))) ("b" nil (((b e:) 0))) @@ -10,7 +10,7 @@ ("cca" nil (((c i r k a) 0))) ("ch" nil (((ch a:) 0))) ("Chocomy¹l" nil (((ch o c o m i s~ l) 0))) -@@ -78,7 +80,16 @@ +@@ -78,7 +80,16 @@ MNCL ("copyrightùm" nil (((k o p i r a j t u: m) 0))) ("czech" nil (((c~ e k) 0))) ("d" nil (((d e:) 0))) @@ -27,7 +27,7 @@ ("Emacs" nil (((i: m e k s) 0))) ("Emacsech" nil (((i: m e k s e ch) 0))) ("Emacsem" nil (((i: m e k s e m) 0))) -@@ -101,6 +112,7 @@ +@@ -101,6 +112,7 @@ MNCL ("Emacsùm" nil (((i: m e k s u: m) 0))) ("escape" nil (((i s k e j p) 0))) ("f" nil (((e f) 0))) @@ -35,7 +35,7 @@ ("foundation" nil (((f a u n d e j s~ n) 0))) ("freeware" nil (((f r i: v e: r e) 0))) ("freewarech" nil (((f r i: v e: r e ch) 0))) -@@ -145,15 +157,45 @@ +@@ -145,15 +157,45 @@ MNCL ("hardwary" nil (((h a r d v e: r i) 0))) ("hardwarù" nil (((h a r d v e: r u:) 0))) ("hardwarùm" nil (((h a r d v e: r u: m) 0))) @@ -81,7 +81,7 @@ ("p" nil (((p e:) 0))) ("pst" nil (((p s t) 0))) ("q" nil (((k v e:) 0))) -@@ -205,10 +247,16 @@ +@@ -205,10 +247,16 @@ MNCL ("softwarù" nil (((s o f t v e: r u:) 0))) ("softwarùm" nil (((s o f t v e: r u: m) 0))) ("t" nil (((t e:) 0))) diff --git a/audio/festlex-czech/files/patch-czech-lexicon.scm b/audio/festlex-czech/files/patch-czech-lexicon.scm index 21ca0a900a4c..2cb7f65bf780 100644 --- a/audio/festlex-czech/files/patch-czech-lexicon.scm +++ b/audio/festlex-czech/files/patch-czech-lexicon.scm @@ -1,5 +1,5 @@ ---- czech-lexicon.scm.orig Wed Dec 26 17:22:02 2007 -+++ czech-lexicon.scm Wed Dec 26 17:28:09 2007 +--- czech-lexicon.scm.orig 2006-06-21 07:32:07 UTC ++++ czech-lexicon.scm @@ -263,3 +263,51 @@ ("softwary" nil (((s o f t v e: r i) 0))) ("softwarù" nil (((s o f t v e: r u:) 0))) diff --git a/audio/festlex-czech/files/patch-czech.scm.in b/audio/festlex-czech/files/patch-czech.scm similarity index 76% rename from audio/festlex-czech/files/patch-czech.scm.in rename to audio/festlex-czech/files/patch-czech.scm index 21cd8d134235..96390fdca044 100644 --- a/audio/festlex-czech/files/patch-czech.scm.in +++ b/audio/festlex-czech/files/patch-czech.scm @@ -1,5 +1,5 @@ ---- czech.scm.orig Wed Jun 21 09:32:07 2006 -+++ czech.scm Sat Apr 28 23:28:07 2007 +--- czech.scm.orig 2006-06-21 07:32:07 UTC ++++ czech.scm @@ -917,7 +917,7 @@ (lex.create "czech") (lex.set.phoneset "czech") diff --git a/audio/festvox-czech/files/patch-Makefile b/audio/festvox-czech/files/patch-Makefile index 0fcba3fb14e9..47e902a66446 100644 --- a/audio/festvox-czech/files/patch-Makefile +++ b/audio/festvox-czech/files/patch-Makefile @@ -1,6 +1,6 @@ ---- ./Makefile.orig 2005-10-05 13:30:55.000000000 +0200 -+++ ./Makefile 2014-04-06 19:24:31.351531891 +0200 -@@ -53,11 +53,11 @@ +--- Makefile.orig 2005-10-05 11:30:55 UTC ++++ Makefile +@@ -53,11 +53,11 @@ distclean: clean maintainer-clean: distclean install: group/ph.group festvox/czech_ph.scm diff --git a/audio/festvox-czech/files/patch-czech_ph.scm.in b/audio/festvox-czech/files/patch-festvox_czech__ph.scm.in similarity index 74% rename from audio/festvox-czech/files/patch-czech_ph.scm.in rename to audio/festvox-czech/files/patch-festvox_czech__ph.scm.in index e30316c4ed44..eb2bfb219c2c 100644 --- a/audio/festvox-czech/files/patch-czech_ph.scm.in +++ b/audio/festvox-czech/files/patch-festvox_czech__ph.scm.in @@ -1,5 +1,5 @@ ---- festvox/czech_ph.scm.in.orig Sun Apr 29 18:50:12 2007 -+++ festvox/czech_ph.scm.in Sun Apr 29 18:50:41 2007 +--- festvox/czech_ph.scm.in.orig 2005-10-03 19:02:26 UTC ++++ festvox/czech_ph.scm.in @@ -10,4 +10,13 @@ (czech-unisyn-init 'czech_ph czech-ph-unisyn-index) (set! czech-int-simple-params* czech-ph-int-params)) diff --git a/audio/firefly/files/patch-mt-daapd.conf.templ b/audio/firefly/files/patch-contrib_mt-daapd.conf.templ similarity index 100% rename from audio/firefly/files/patch-mt-daapd.conf.templ rename to audio/firefly/files/patch-contrib_mt-daapd.conf.templ diff --git a/audio/firefly/files/patch-plugins_out-daap.c b/audio/firefly/files/patch-src_plugins_out-daap.c similarity index 100% rename from audio/firefly/files/patch-plugins_out-daap.c rename to audio/firefly/files/patch-src_plugins_out-daap.c diff --git a/audio/flacon/files/patch-CMakeLists.txt b/audio/flacon/files/patch-CMakeLists.txt index a0170c6a7cee..42a7eaec7eed 100644 --- a/audio/flacon/files/patch-CMakeLists.txt +++ b/audio/flacon/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2015-09-04 19:04:20 UTC +--- CMakeLists.txt.orig 2016-01-29 18:07:49 UTC +++ CMakeLists.txt -@@ -348,7 +348,7 @@ configure_file( +@@ -324,7 +324,7 @@ configure_file( add_custom_command(TARGET ${PROJECT_NAME} COMMAND gzip -c ${CMAKE_CURRENT_BINARY_DIR}/flacon.1 > ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz ) diff --git a/audio/fluidsynth-dssi/files/patch-src-Makefile.in b/audio/fluidsynth-dssi/files/patch-src_Makefile.in similarity index 84% rename from audio/fluidsynth-dssi/files/patch-src-Makefile.in rename to audio/fluidsynth-dssi/files/patch-src_Makefile.in index 87dd25237c5b..7bb7cda13ee4 100644 --- a/audio/fluidsynth-dssi/files/patch-src-Makefile.in +++ b/audio/fluidsynth-dssi/files/patch-src_Makefile.in @@ -1,6 +1,6 @@ ---- src/Makefile.in.orig Tue Jan 23 21:35:02 2007 -+++ src/Makefile.in Tue Jan 23 21:35:52 2007 -@@ -697,12 +697,12 @@ +--- src/Makefile.in.orig 2009-01-04 23:43:52 UTC ++++ src/Makefile.in +@@ -605,12 +605,12 @@ uninstall-am: uninstall-pluginLTLIBRARIE # create symlinks for the plugin to jack-dssi-host install-exec-hook: diff --git a/audio/fluidsynth/files/patch-src__bindings__fluid_rtkit.c b/audio/fluidsynth/files/patch-src_bindings_fluid__rtkit.c similarity index 85% rename from audio/fluidsynth/files/patch-src__bindings__fluid_rtkit.c rename to audio/fluidsynth/files/patch-src_bindings_fluid__rtkit.c index 47478bd79733..2a36fb3bd018 100644 --- a/audio/fluidsynth/files/patch-src__bindings__fluid_rtkit.c +++ b/audio/fluidsynth/files/patch-src_bindings_fluid__rtkit.c @@ -1,5 +1,5 @@ ---- src/bindings/fluid_rtkit.c.orig 2011-09-04 16:38:58.000000000 +0900 -+++ src/bindings/fluid_rtkit.c 2011-09-05 17:07:06.000000000 +0900 +--- src/bindings/fluid_rtkit.c.orig 2012-08-16 04:01:13 UTC ++++ src/bindings/fluid_rtkit.c @@ -34,7 +34,7 @@ #include "fluid_rtkit.h" diff --git a/audio/fluidsynth/files/patch-src__drivers__fluid_alsa.c b/audio/fluidsynth/files/patch-src_drivers_fluid__alsa.c similarity index 53% rename from audio/fluidsynth/files/patch-src__drivers__fluid_alsa.c rename to audio/fluidsynth/files/patch-src_drivers_fluid__alsa.c index 26d07b59f84a..bfa0dfb93968 100644 --- a/audio/fluidsynth/files/patch-src__drivers__fluid_alsa.c +++ b/audio/fluidsynth/files/patch-src_drivers_fluid__alsa.c @@ -1,12 +1,14 @@ ---- src/drivers/fluid_alsa.c 2012-08-16 00:01:13.000000000 -0400 -+++ src/drivers/fluid_alsa.c 2014-12-20 12:59:44.000000000 -0500 -@@ -348,5 +348,4 @@ +--- src/drivers/fluid_alsa.c.orig 2012-08-16 04:01:13 UTC ++++ src/drivers/fluid_alsa.c +@@ -347,14 +347,16 @@ static int fluid_alsa_handle_write_error + case -EAGAIN: snd_pcm_wait(pcm, 1); break; - case -EPIPE: case -EBADFD: if (snd_pcm_prepare(pcm) != 0) { -@@ -355,5 +354,8 @@ + FLUID_LOG(FLUID_ERR, "Failed to prepare the audio device"); + return FLUID_FAILED; } break; + case -EPIPE: @@ -15,3 +17,4 @@ +#endif if ((snd_pcm_resume(pcm) != 0) && (snd_pcm_prepare(pcm) != 0)) { FLUID_LOG(FLUID_ERR, "Failed to resume the audio device"); + return FLUID_FAILED; diff --git a/audio/fluidsynth/files/patch-src__drivers__fluid_oss.c b/audio/fluidsynth/files/patch-src_drivers_fluid__oss.c similarity index 71% rename from audio/fluidsynth/files/patch-src__drivers__fluid_oss.c rename to audio/fluidsynth/files/patch-src_drivers_fluid__oss.c index dea1fe2b54a9..dc5089f4b636 100644 --- a/audio/fluidsynth/files/patch-src__drivers__fluid_oss.c +++ b/audio/fluidsynth/files/patch-src_drivers_fluid__oss.c @@ -1,5 +1,5 @@ ---- src/drivers/fluid_oss.c.orig 2012-08-16 13:01:13.000000000 +0900 -+++ src/drivers/fluid_oss.c 2012-08-18 04:12:09.000000000 +0900 +--- src/drivers/fluid_oss.c.orig 2012-08-16 04:01:13 UTC ++++ src/drivers/fluid_oss.c @@ -45,9 +45,9 @@ #define BUFFER_LENGTH 512 diff --git a/audio/fmit/files/patch-libs_CppAddons_CMakeLists.txt b/audio/fmit/files/patch-libs_CppAddons_CMakeLists.txt new file mode 100644 index 000000000000..9a1d66e4cbed --- /dev/null +++ b/audio/fmit/files/patch-libs_CppAddons_CMakeLists.txt @@ -0,0 +1,9 @@ +--- libs/CppAddons/CMakeLists.txt.orig 2012-06-23 20:03:59 UTC ++++ libs/CppAddons/CMakeLists.txt +@@ -8,6 +8,4 @@ INCLUDE_DIRECTORIES( + ${CMAKE_CURRENT_BINARY_DIR} + ) + +-set(CMAKE_CXX_FLAGS "-Wall -ansi -pedantic") +- + add_library(CppAddons STATIC ${libCppAddons_SRCS}) diff --git a/audio/fmit/files/patch-libs__Music__CMakeLists.txt b/audio/fmit/files/patch-libs_Music_CMakeLists.txt similarity index 53% rename from audio/fmit/files/patch-libs__Music__CMakeLists.txt rename to audio/fmit/files/patch-libs_Music_CMakeLists.txt index 012a67bb2c8e..b436d6e3fedf 100644 --- a/audio/fmit/files/patch-libs__Music__CMakeLists.txt +++ b/audio/fmit/files/patch-libs_Music_CMakeLists.txt @@ -1,6 +1,6 @@ ---- libs/Music/CMakeLists.txt.orig 2011-01-28 08:09:11.000000000 +0900 -+++ libs/Music/CMakeLists.txt 2011-08-21 21:55:31.000000000 +0900 -@@ -18,8 +18,7 @@ +--- libs/Music/CMakeLists.txt.orig 2012-06-23 20:03:59 UTC ++++ libs/Music/CMakeLists.txt +@@ -18,8 +18,7 @@ SET(libMusic_SRCS INCLUDE_DIRECTORIES( ../../libs ${CMAKE_CURRENT_BINARY_DIR} diff --git a/audio/fmit/files/patch-libs__Music__Music.h b/audio/fmit/files/patch-libs_Music_Music.h similarity index 65% rename from audio/fmit/files/patch-libs__Music__Music.h rename to audio/fmit/files/patch-libs_Music_Music.h index 0d69bd61f1d7..350320764adc 100644 --- a/audio/fmit/files/patch-libs__Music__Music.h +++ b/audio/fmit/files/patch-libs_Music_Music.h @@ -1,6 +1,6 @@ ---- libs/Music/Music.h.orig 2011-01-28 08:09:11.000000000 +0900 -+++ libs/Music/Music.h 2011-08-21 21:51:54.000000000 +0900 -@@ -285,7 +285,7 @@ +--- libs/Music/Music.h.orig 2014-05-30 11:38:46 UTC ++++ libs/Music/Music.h +@@ -285,7 +285,7 @@ namespace Music // TODO cannot create a template so easily because the pow10 is not defined for all types inline double invlp(double value) { diff --git a/audio/fmit/files/patch-libs__CppAddons__CMakeLists.txt b/audio/fmit/files/patch-libs__CppAddons__CMakeLists.txt deleted file mode 100644 index 65df2b6ee085..000000000000 --- a/audio/fmit/files/patch-libs__CppAddons__CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ ---- libs/CppAddons/CMakeLists.txt.orig 2011-01-28 08:09:11.000000000 +0900 -+++ libs/CppAddons/CMakeLists.txt 2011-08-21 21:54:31.000000000 +0900 -@@ -8,6 +8,4 @@ - ${CMAKE_CURRENT_BINARY_DIR} - ) - --set(CMAKE_CXX_FLAGS "-Wall -ansi -pedantic") -- - add_library(CppAddons STATIC ${libCppAddons_SRCS}) diff --git a/audio/fmit/files/patch-src__CMakeLists.txt b/audio/fmit/files/patch-src_CMakeLists.txt similarity index 71% rename from audio/fmit/files/patch-src__CMakeLists.txt rename to audio/fmit/files/patch-src_CMakeLists.txt index 74f15487a5b2..70e4e18e0d48 100644 --- a/audio/fmit/files/patch-src__CMakeLists.txt +++ b/audio/fmit/files/patch-src_CMakeLists.txt @@ -1,6 +1,6 @@ ---- src/CMakeLists.txt.orig 2011-01-28 08:09:11.000000000 +0900 -+++ src/CMakeLists.txt 2011-09-06 15:56:58.000000000 +0900 -@@ -35,10 +35,11 @@ +--- src/CMakeLists.txt.orig 2012-06-23 20:03:58 UTC ++++ src/CMakeLists.txt +@@ -35,10 +35,11 @@ SET (FILES_TO_TRANSLATE ${FILES_TO_TRANS INCLUDE_DIRECTORIES( ../libs ${CMAKE_CURRENT_BINARY_DIR} @@ -13,7 +13,7 @@ ) IF (UPDATE_TRANSLATIONS) -@@ -53,6 +54,7 @@ +@@ -53,6 +54,7 @@ ADD_EXECUTABLE(fmit ${fmit_UI_H} ${fmit_ TARGET_LINK_LIBRARIES(fmit CppAddons Music fmit_modules diff --git a/audio/fmit/files/patch-src__modules__CMakeLists.txt b/audio/fmit/files/patch-src_modules_CMakeLists.txt similarity index 53% rename from audio/fmit/files/patch-src__modules__CMakeLists.txt rename to audio/fmit/files/patch-src_modules_CMakeLists.txt index 5c70ea6c8dd0..5eef2d3f0b42 100644 --- a/audio/fmit/files/patch-src__modules__CMakeLists.txt +++ b/audio/fmit/files/patch-src_modules_CMakeLists.txt @@ -1,6 +1,6 @@ ---- src/modules/CMakeLists.txt.orig 2011-01-28 08:09:11.000000000 +0900 -+++ src/modules/CMakeLists.txt 2011-08-21 21:56:20.000000000 +0900 -@@ -29,6 +29,7 @@ +--- src/modules/CMakeLists.txt.orig 2012-06-23 20:03:58 UTC ++++ src/modules/CMakeLists.txt +@@ -29,6 +29,7 @@ SET (FILES_TO_TRANSLATE ${FILES_TO_TRANS INCLUDE_DIRECTORIES( ../../libs ${CMAKE_CURRENT_BINARY_DIR} diff --git a/audio/fpc-a52/files/patch-packages_a52_fpmake.pp b/audio/fpc-a52/files/patch-packages_a52_fpmake.pp index 5a0b627cc1c0..de501c6d93b2 100644 --- a/audio/fpc-a52/files/patch-packages_a52_fpmake.pp +++ b/audio/fpc-a52/files/patch-packages_a52_fpmake.pp @@ -1,4 +1,4 @@ ---- packages/a52/fpmake.pp.orig 2015-01-05 19:27:06 UTC +--- packages/a52/fpmake.pp.orig 2015-11-13 21:15:29 UTC +++ packages/a52/fpmake.pp @@ -20,7 +20,7 @@ begin P.Email := ''; diff --git a/audio/fpc-mad/files/patch-packages_mad_fpmake.pp b/audio/fpc-mad/files/patch-packages_mad_fpmake.pp index 11910f3c1466..a9c63f2d4c2b 100644 --- a/audio/fpc-mad/files/patch-packages_mad_fpmake.pp +++ b/audio/fpc-mad/files/patch-packages_mad_fpmake.pp @@ -1,4 +1,4 @@ ---- packages/mad/fpmake.pp.orig 2015-08-29 16:37:05 UTC +--- packages/mad/fpmake.pp.orig 2015-11-13 21:15:29 UTC +++ packages/mad/fpmake.pp @@ -17,7 +17,7 @@ begin P.Directory:=ADirectory; diff --git a/audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp b/audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp index 8de641e4636e..08157c0e8651 100644 --- a/audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp +++ b/audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp @@ -1,4 +1,4 @@ ---- packages/modplug/fpmake.pp.orig 2015-08-07 13:22:31 UTC +--- packages/modplug/fpmake.pp.orig 2015-11-13 21:15:29 UTC +++ packages/modplug/fpmake.pp @@ -17,7 +17,7 @@ begin P.Directory:=ADirectory; diff --git a/audio/fpc-oggvorbis/files/patch-packages_oggvorbis_fpmake.pp b/audio/fpc-oggvorbis/files/patch-packages_oggvorbis_fpmake.pp index 8c21acf0a305..3cc105136938 100644 --- a/audio/fpc-oggvorbis/files/patch-packages_oggvorbis_fpmake.pp +++ b/audio/fpc-oggvorbis/files/patch-packages_oggvorbis_fpmake.pp @@ -1,8 +1,8 @@ ---- packages/oggvorbis/fpmake.pp.orig 2015-01-05 19:27:06.000000000 +0000 +--- packages/oggvorbis/fpmake.pp.orig 2015-11-13 21:15:29 UTC +++ packages/oggvorbis/fpmake.pp @@ -19,7 +19,7 @@ begin {$endif ALLPACKAGES} - P.Version:='3.0.1'; + P.Version:='3.0.0'; P.SourcePath.Add('src'); - P.OSes := [linux,win32,wince]; + P.OSes := [linux,win32,wince,dragonfly,freebsd]; diff --git a/audio/fpc-openal/files/patch-packages_openal_fpmake.pp b/audio/fpc-openal/files/patch-packages_openal_fpmake.pp index 791b5f77a045..3f5a1388a70e 100644 --- a/audio/fpc-openal/files/patch-packages_openal_fpmake.pp +++ b/audio/fpc-openal/files/patch-packages_openal_fpmake.pp @@ -1,8 +1,8 @@ ---- packages/openal/fpmake.pp.orig 2015-01-05 19:27:06.000000000 +0000 +--- packages/openal/fpmake.pp.orig 2015-11-13 21:15:29 UTC +++ packages/openal/fpmake.pp @@ -19,9 +19,9 @@ begin {$endif ALLPACKAGES} - P.Version:='3.0.1'; + P.Version:='3.0.0'; if Defaults.CPU = i386 then - P.OSes := [linux,win32,darwin] + P.OSes := [linux,win32,darwin,dragonfly,freebsd] diff --git a/audio/fplib/files/patch-CMakeLists.txt b/audio/fplib/files/patch-CMakeLists.txt index 979c8c8540fa..637e4b0d5647 100644 --- a/audio/fplib/files/patch-CMakeLists.txt +++ b/audio/fplib/files/patch-CMakeLists.txt @@ -2,7 +2,7 @@ Link against an actual target name, not the generated library name. If we link against the latter, there is no dependency between lastfm-fpclient and fplib, which can break parallel builds starting with CMake 3.5.0. ---- CMakeLists.txt.orig 2016-03-16 09:53:03 UTC +--- CMakeLists.txt.orig 2013-10-23 16:45:46 UTC +++ CMakeLists.txt @@ -139,7 +139,7 @@ ADD_EXECUTABLE(lastfm-fpclient diff --git a/audio/freealut/files/patch-src_alutInit.c b/audio/freealut/files/patch-src_alutInit.c index f19ac896b7f9..d111d24abf29 100644 --- a/audio/freealut/files/patch-src_alutInit.c +++ b/audio/freealut/files/patch-src_alutInit.c @@ -1,6 +1,6 @@ ---- src/alutInit.c.orig Wed Mar 8 16:40:26 2006 -+++ src/alutInit.c Wed Mar 8 16:41:23 2006 -@@ -147,11 +147,7 @@ +--- src/alutInit.c.orig 2006-05-08 09:28:07 UTC ++++ src/alutInit.c +@@ -147,11 +147,7 @@ alutExit (void) return AL_FALSE; } diff --git a/audio/freealut/files/patch-src_alutInternal.h b/audio/freealut/files/patch-src_alutInternal.h index 179705398090..afa799efeb7b 100644 --- a/audio/freealut/files/patch-src_alutInternal.h +++ b/audio/freealut/files/patch-src_alutInternal.h @@ -1,5 +1,5 @@ ---- src/alutInternal.h.orig Fri Mar 31 06:15:08 2006 -+++ src/alutInternal.h Fri Mar 31 06:15:46 2006 +--- src/alutInternal.h.orig 2006-05-08 09:28:07 UTC ++++ src/alutInternal.h @@ -13,23 +13,8 @@ #if HAVE_STDINT_H @@ -24,4 +24,4 @@ +#include #endif - typedef uint16_t UInt16LittleEndian; + typedef int16_t Int16BigEndian; diff --git a/audio/freealut/files/patch-src_alutLoader.c b/audio/freealut/files/patch-src_alutLoader.c index d395cd9602dd..79aacab3d449 100644 --- a/audio/freealut/files/patch-src_alutLoader.c +++ b/audio/freealut/files/patch-src_alutLoader.c @@ -1,6 +1,6 @@ ---- src/alutLoader.c.orig Sun Aug 6 19:00:08 2006 -+++ src/alutLoader.c Sun Aug 6 19:01:10 2006 -@@ -474,7 +474,7 @@ +--- src/alutLoader.c.orig 2006-05-08 09:28:07 UTC ++++ src/alutLoader.c +@@ -474,7 +474,7 @@ alutLoadWAVMemory (ALbyte *buffer, ALenu /* ToDo: Can we do something less insane than passing 0x7FFFFFFF? */ stream = _alutInputStreamConstructFromMemory (buffer, 0x7FFFFFFF); diff --git a/audio/freealut/files/patch-src_alutUtil.c b/audio/freealut/files/patch-src_alutUtil.c index d0977b4dabe0..26b4edd94037 100644 --- a/audio/freealut/files/patch-src_alutUtil.c +++ b/audio/freealut/files/patch-src_alutUtil.c @@ -1,5 +1,5 @@ ---- src/alutUtil.c.orig Fri Mar 31 14:48:10 2006 -+++ src/alutUtil.c Fri Mar 31 14:48:22 2006 +--- src/alutUtil.c.orig 2006-05-08 09:28:07 UTC ++++ src/alutUtil.c @@ -2,6 +2,7 @@ #if HAVE_NANOSLEEP && HAVE_TIME_H diff --git a/audio/ghostess/files/patch-configure b/audio/ghostess/files/patch-configure index 9c43c59d92c6..9260c230d7ca 100644 --- a/audio/ghostess/files/patch-configure +++ b/audio/ghostess/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2010-09-24 02:36:53.000000000 +0900 -+++ configure 2011-03-14 08:06:46.000000000 +0900 -@@ -10932,10 +10932,10 @@ +--- configure.orig 2012-01-06 04:25:27 UTC ++++ configure +@@ -11719,10 +11719,10 @@ rm -f core conftest.err conftest.$ac_obj case "${host_os}" in diff --git a/audio/ghostess/files/patch-src-ghostess.c b/audio/ghostess/files/patch-src-ghostess.c deleted file mode 100644 index d83cda53e2b4..000000000000 --- a/audio/ghostess/files/patch-src-ghostess.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/ghostess.c.orig 2006-11-28 06:39:41.000000000 +0100 -+++ src/ghostess.c 2008-07-23 01:33:28.000000000 +0200 -@@ -56,6 +56,7 @@ - #include - #include - #include -+#include - - #include - diff --git a/audio/ghostess/files/patch-src-Makefile.in b/audio/ghostess/files/patch-src_Makefile.in similarity index 76% rename from audio/ghostess/files/patch-src-Makefile.in rename to audio/ghostess/files/patch-src_Makefile.in index 32c554e3d5f4..3a3bb3ef8de3 100644 --- a/audio/ghostess/files/patch-src-Makefile.in +++ b/audio/ghostess/files/patch-src_Makefile.in @@ -1,6 +1,6 @@ ---- src/Makefile.in.orig Fri Jan 19 00:40:57 2007 -+++ src/Makefile.in Fri Jan 19 00:42:05 2007 -@@ -207,9 +207,7 @@ +--- src/Makefile.in.orig 2012-01-06 04:25:25 UTC ++++ src/Makefile.in +@@ -226,9 +226,7 @@ top_srcdir = @top_srcdir@ @DARWIN_TRUE@@MIDI_JACK_TRUE@MIDI_SRCS = midi-jack.c @DARWIN_FALSE@DARWIN_LD_FLAGS = @DARWIN_TRUE@@MIDI_JACK_FALSE@DARWIN_LD_FLAGS = -framework CoreFoundation -framework CoreMIDI diff --git a/audio/ghostess/files/patch-src_ghostess.c b/audio/ghostess/files/patch-src_ghostess.c new file mode 100644 index 000000000000..c7569e8691d5 --- /dev/null +++ b/audio/ghostess/files/patch-src_ghostess.c @@ -0,0 +1,10 @@ +--- src/ghostess.c.orig 2012-01-06 06:11:54 UTC ++++ src/ghostess.c +@@ -57,6 +57,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/audio/gkrellmms2/files/patch-Makefile b/audio/gkrellmms2/files/patch-Makefile index afb7091926e0..236bacfcd20f 100644 --- a/audio/gkrellmms2/files/patch-Makefile +++ b/audio/gkrellmms2/files/patch-Makefile @@ -1,7 +1,6 @@ Index: Makefile -diff -u Makefile.orig Makefile ---- Makefile.orig Sat Jan 22 02:02:17 2005 -+++ Makefile Mon Feb 14 10:42:06 2005 +--- Makefile.orig 2005-01-21 17:02:17 UTC ++++ Makefile @@ -3,8 +3,8 @@ # You may want to rename the binary-file. BIN_FILENAME = gkrellmms @@ -13,7 +12,7 @@ diff -u Makefile.orig Makefile IMLIB_INCLUDE ?= IMLIB_LIB ?= -@@ -18,9 +18,9 @@ +@@ -18,9 +18,9 @@ endif PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins @@ -25,7 +24,7 @@ diff -u Makefile.orig Makefile ifdef USE_BMP FLAGS += -DUSE_BMP -@@ -35,8 +35,7 @@ +@@ -35,8 +35,7 @@ PACKAGE ?= gkrellmms FLAGS += -DPACKAGE="\"$(PACKAGE)\"" export PACKAGE LOCALEDIR @@ -35,7 +34,7 @@ diff -u Makefile.orig Makefile INSTALL = install -c INSTALL_PROGRAM = $(INSTALL) -s -@@ -47,7 +46,7 @@ +@@ -47,7 +46,7 @@ all: $(BIN_FILENAME).so (cd po && ${MAKE} all ) $(BIN_FILENAME).so: $(OBJS) diff --git a/audio/gkrellmvolume2/files/patch-Makefile b/audio/gkrellmvolume2/files/patch-Makefile index fceb1bf7e3ae..e75bc5200c94 100644 --- a/audio/gkrellmvolume2/files/patch-Makefile +++ b/audio/gkrellmvolume2/files/patch-Makefile @@ -1,8 +1,7 @@ Index: Makefile -diff -u Makefile.orig Makefile ---- Makefile.orig Thu Nov 7 01:50:59 2002 -+++ Makefile Thu Nov 7 04:49:05 2002 -@@ -3,12 +3,12 @@ +--- Makefile.orig 2004-08-19 20:07:27 UTC ++++ Makefile +@@ -9,12 +9,12 @@ export PACKAGE LOCALEDIR GTK_CONFIG = pkg-config gtk+-2.0 PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins @@ -17,16 +16,16 @@ diff -u Makefile.orig Makefile LIBS = $(GTK_LIB) LFLAGS = -shared -@@ -22,8 +22,6 @@ - FLAGS += -DPACKAGE="\"$(PACKAGE)\"" - export PACKAGE LOCALEDIR +@@ -31,8 +31,6 @@ ifeq ($(enable_nls),1) + export enable_nls + endif -CC = gcc $(CFLAGS) $(FLAGS) - INSTALL = install -c INSTALL_PROGRAM = $(INSTALL) -s -@@ -33,7 +31,7 @@ +@@ -40,7 +38,7 @@ all: volume.so (cd po && ${MAKE} all ) volume.so: $(OBJS) diff --git a/audio/gkrellmvolume2/files/patch-oss_mixer.c b/audio/gkrellmvolume2/files/patch-oss__mixer.c similarity index 75% rename from audio/gkrellmvolume2/files/patch-oss_mixer.c rename to audio/gkrellmvolume2/files/patch-oss__mixer.c index c75de5ef7742..f6892f590977 100644 --- a/audio/gkrellmvolume2/files/patch-oss_mixer.c +++ b/audio/gkrellmvolume2/files/patch-oss__mixer.c @@ -1,5 +1,5 @@ ---- oss_mixer.c.orig 2004-08-20 00:07:27.000000000 +0400 -+++ oss_mixer.c 2015-02-01 20:21:32.000000000 +0300 +--- oss_mixer.c.orig 2004-08-19 20:07:27 UTC ++++ oss_mixer.c @@ -32,6 +32,9 @@ #else #include @@ -10,7 +10,7 @@ #include "mixer.h" #include "oss_mixer.h" -@@ -126,7 +129,7 @@ +@@ -126,7 +129,7 @@ oss_mixer_device_get_volume(mixer_t *mix long amount; ioctl(OSSMIXER(mixer)->fd,MIXER_READ(OSSMIXER(mixer)->table[devid]),&amount); *left = amount & 0xff; diff --git a/audio/glame/files/patch-Makefile.in b/audio/glame/files/patch-Makefile.in index 9d41ec1c7600..a9cb91f93629 100644 --- a/audio/glame/files/patch-Makefile.in +++ b/audio/glame/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig Fri Oct 29 03:53:30 2004 -+++ Makefile.in Fri Oct 29 21:29:55 2004 -@@ -280,7 +280,7 @@ +--- Makefile.in.orig 2005-03-28 17:11:43 UTC ++++ Makefile.in +@@ -281,7 +281,7 @@ sharedstatedir = @sharedstatedir@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ diff --git a/audio/glame/files/patch-src_glmid_glconfig.c b/audio/glame/files/patch-src_glmid_glconfig.c index 0b3d3632407b..16a2ba1abcdc 100644 --- a/audio/glame/files/patch-src_glmid_glconfig.c +++ b/audio/glame/files/patch-src_glmid_glconfig.c @@ -1,5 +1,5 @@ ---- src/glmid/glconfig.c.orig 2008-03-02 14:05:46.000000000 -0500 -+++ src/glmid/glconfig.c 2008-03-02 14:06:23.000000000 -0500 +--- src/glmid/glconfig.c.orig 2004-10-23 13:09:23 UTC ++++ src/glmid/glconfig.c @@ -125,7 +125,8 @@ int glame_config_get_long(const char *ke snprintf(cmd, 255, "(glame-config-get '%s)", key); /* FIXME: execute with catch. */ diff --git a/audio/glame/files/patch-src_glmid_glscript.h b/audio/glame/files/patch-src_glmid_glscript.h index fd2642f6f3b4..222a404ace69 100644 --- a/audio/glame/files/patch-src_glmid_glscript.h +++ b/audio/glame/files/patch-src_glmid_glscript.h @@ -1,5 +1,5 @@ ---- src/glmid/glscript.h.orig 2008-03-02 14:07:01.000000000 -0500 -+++ src/glmid/glscript.h 2008-03-02 14:07:39.000000000 -0500 +--- src/glmid/glscript.h.orig 2004-10-23 13:09:23 UTC ++++ src/glmid/glscript.h @@ -32,6 +32,12 @@ #include "gpsm.h" #include "swapfile.h" diff --git a/audio/glame/files/patch-src_glmid_glscript_swapfile.c b/audio/glame/files/patch-src_glmid_glscript__swapfile.c similarity index 88% rename from audio/glame/files/patch-src_glmid_glscript_swapfile.c rename to audio/glame/files/patch-src_glmid_glscript__swapfile.c index 3f204dd49ea3..e52a4e845783 100644 --- a/audio/glame/files/patch-src_glmid_glscript_swapfile.c +++ b/audio/glame/files/patch-src_glmid_glscript__swapfile.c @@ -1,5 +1,5 @@ ---- src/glmid/glscript_swapfile.c.orig 2008-03-02 14:08:24.000000000 -0500 -+++ src/glmid/glscript_swapfile.c 2008-03-02 14:09:14.000000000 -0500 +--- src/glmid/glscript_swapfile.c.orig 2004-10-23 13:09:23 UTC ++++ src/glmid/glscript_swapfile.c @@ -374,6 +374,7 @@ int glscript_init_swapfile() glame_reg_export ("swfd?", 1, 0, 0, gls_is_swfd); glame_reg_export ("swdir?", 1, 0, 0, gls_is_swdir); diff --git a/audio/glame/files/patch-src_gui_glame_console.c b/audio/glame/files/patch-src_gui_glame__console.c similarity index 71% rename from audio/glame/files/patch-src_gui_glame_console.c rename to audio/glame/files/patch-src_gui_glame__console.c index 2e01702df7d0..47b436cacc30 100644 --- a/audio/glame/files/patch-src_gui_glame_console.c +++ b/audio/glame/files/patch-src_gui_glame__console.c @@ -1,5 +1,5 @@ ---- src/gui/glame_console.c.orig 2008-03-02 14:01:12.000000000 -0500 -+++ src/gui/glame_console.c 2008-03-02 14:01:34.000000000 -0500 +--- src/gui/glame_console.c.orig 2004-10-23 13:09:24 UTC ++++ src/gui/glame_console.c @@ -60,7 +60,7 @@ static void port_register() port = scm_make_port_type("glame-console", NULL, port_write); diff --git a/audio/glame/files/patch-src_include_glame_guile_compat.h b/audio/glame/files/patch-src_include_glame__guile__compat.h similarity index 92% rename from audio/glame/files/patch-src_include_glame_guile_compat.h rename to audio/glame/files/patch-src_include_glame__guile__compat.h index 90492f2bf474..33cfd7454bcc 100644 --- a/audio/glame/files/patch-src_include_glame_guile_compat.h +++ b/audio/glame/files/patch-src_include_glame__guile__compat.h @@ -1,5 +1,5 @@ ---- src/include/glame_guile_compat.h.orig 2008-03-02 13:59:02.000000000 -0500 -+++ src/include/glame_guile_compat.h 2008-03-02 13:59:41.000000000 -0500 +--- src/include/glame_guile_compat.h.orig 2004-10-23 13:09:27 UTC ++++ src/include/glame_guile_compat.h @@ -32,58 +32,10 @@ #include diff --git a/audio/glame/files/patch-src__plugins__audio_io_oss.c b/audio/glame/files/patch-src_plugins_audio__io__oss.c similarity index 72% rename from audio/glame/files/patch-src__plugins__audio_io_oss.c rename to audio/glame/files/patch-src_plugins_audio__io__oss.c index 6b75c9278a75..0a65a18ec266 100644 --- a/audio/glame/files/patch-src__plugins__audio_io_oss.c +++ b/audio/glame/files/patch-src_plugins_audio__io__oss.c @@ -1,5 +1,5 @@ ---- src/plugins/audio_io_oss.c 2003/07/01 12:26:28 1.1 -+++ src/plugins/audio_io_oss.c 2003/07/01 12:26:41 +--- src/plugins/audio_io_oss.c.orig 2005-03-27 12:29:48 UTC ++++ src/plugins/audio_io_oss.c @@ -26,9 +26,9 @@ #ifdef HAVE_OSS_LINUX diff --git a/audio/glame/files/patch-swapfile.c b/audio/glame/files/patch-src_swapfile_swapfile__fs.c similarity index 66% rename from audio/glame/files/patch-swapfile.c rename to audio/glame/files/patch-src_swapfile_swapfile__fs.c index 412fee712593..64443e04673e 100644 --- a/audio/glame/files/patch-swapfile.c +++ b/audio/glame/files/patch-src_swapfile_swapfile__fs.c @@ -1,5 +1,5 @@ ---- src/swapfile/swapfile_fs.c.orig Sat Oct 23 22:09:29 2004 -+++ src/swapfile/swapfile_fs.c Tue Mar 29 23:11:17 2005 +--- src/swapfile/swapfile_fs.c.orig 2004-10-23 13:09:29 UTC ++++ src/swapfile/swapfile_fs.c @@ -44,8 +44,12 @@ #define DEBUG 1 #endif diff --git a/audio/gmixer/files/patch-Makefile b/audio/gmixer/files/patch-Makefile index 688a6fc98822..20a85225a0c0 100644 --- a/audio/gmixer/files/patch-Makefile +++ b/audio/gmixer/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Sat Apr 3 13:33:52 1999 -+++ Makefile Sat Apr 3 13:33:54 1999 +--- Makefile.orig 1999-02-21 10:18:50 UTC ++++ Makefile @@ -1,9 +1,9 @@ -CC = gcc +CC ?= gcc diff --git a/audio/gmixer/files/patch-gmixer.c b/audio/gmixer/files/patch-gmixer.c index b1671cd76bc3..a340ea5879b4 100644 --- a/audio/gmixer/files/patch-gmixer.c +++ b/audio/gmixer/files/patch-gmixer.c @@ -1,5 +1,5 @@ ---- gmixer.c.orig 1999-02-22 17:11:10.000000000 +0100 -+++ gmixer.c 2007-10-24 13:30:08.000000000 +0200 +--- gmixer.c.orig 1999-02-22 16:11:10 UTC ++++ gmixer.c @@ -1,10 +1,11 @@ #include #include @@ -13,7 +13,7 @@ #include #include "icons/gmixer.xpm" #include "icons/mix_logo.xpm" -@@ -378,6 +379,27 @@ +@@ -378,6 +379,27 @@ void usage(char *prog_name) exit(0); } @@ -41,7 +41,7 @@ int main (int argc, char *argv[]) { char *homedir; -@@ -385,6 +407,7 @@ +@@ -385,6 +407,7 @@ int main (int argc, char *argv[]) char *default_dev = "/dev/mixer"; int i; g_print ("gmixer 0.98 (22.2.1999)\nCopyleft (C) 1998,1999 - Sergey Kiselev \n"); diff --git a/audio/gnaural/files/patch-Makefile.in b/audio/gnaural/files/patch-Makefile.in index 3f8ae3ef91b4..401b80db4dd0 100644 --- a/audio/gnaural/files/patch-Makefile.in +++ b/audio/gnaural/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2011-05-26 00:38:21.000000000 +0200 -+++ Makefile.in 2012-01-18 07:12:38.767047961 +0100 -@@ -742,15 +742,16 @@ +--- Makefile.in.orig 2011-05-25 22:38:21 UTC ++++ Makefile.in +@@ -742,15 +742,16 @@ uninstall-am: install-data-local: @$(NORMAL_INSTALL) if test -d $(srcdir)/pixmaps; then \ diff --git a/audio/gnaural/files/patch-configure b/audio/gnaural/files/patch-configure index 34ae4d62f1b1..1155c42400e6 100644 --- a/audio/gnaural/files/patch-configure +++ b/audio/gnaural/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2011-05-26 00:38:21.000000000 +0200 -+++ configure 2013-10-31 06:32:24.000000000 +0100 -@@ -7642,7 +7642,7 @@ +--- configure.orig 2011-05-25 22:38:21 UTC ++++ configure +@@ -7642,7 +7642,7 @@ case $host in esac #do pkgconfig stuff: diff --git a/audio/gnomoradio/files/patch-gnomoradio_browser-link.cc b/audio/gnomoradio/files/patch-gnomoradio_browser-link.cc index 978bdccea94e..e55afec0a3d5 100644 --- a/audio/gnomoradio/files/patch-gnomoradio_browser-link.cc +++ b/audio/gnomoradio/files/patch-gnomoradio_browser-link.cc @@ -1,6 +1,6 @@ ---- gnomoradio/browser-link.cc.orig 2007-12-06 15:46:11.000000000 +0100 -+++ gnomoradio/browser-link.cc 2007-12-06 15:48:02.000000000 +0100 -@@ -32,7 +32,7 @@ +--- gnomoradio/browser-link.cc.orig 2004-10-17 01:41:23 UTC ++++ gnomoradio/browser-link.cc +@@ -32,7 +32,7 @@ static void mozilla_fallback (const Glib { gchar *my_url = g_strdup(Glib::locale_from_utf8(url).c_str()); if (fork() == 0) { diff --git a/audio/gnomoradio/files/patch-rainbow__license.cc b/audio/gnomoradio/files/patch-rainbow_license.cc similarity index 53% rename from audio/gnomoradio/files/patch-rainbow__license.cc rename to audio/gnomoradio/files/patch-rainbow_license.cc index 0a77cd7e3776..433a80a1edf6 100644 --- a/audio/gnomoradio/files/patch-rainbow__license.cc +++ b/audio/gnomoradio/files/patch-rainbow_license.cc @@ -1,6 +1,6 @@ ---- rainbow/license.cc.orig Wed Dec 22 11:05:36 2004 -+++ rainbow/license.cc Wed Dec 22 11:06:49 2004 -@@ -54,7 +54,7 @@ +--- rainbow/license.cc.orig 2004-10-17 04:03:47 UTC ++++ rainbow/license.cc +@@ -54,7 +54,7 @@ void Rainbow::License::get_and_do (const } if (done) { diff --git a/audio/gnomoradio/files/patch-rainbow__rdf-resource.cc b/audio/gnomoradio/files/patch-rainbow_rdf-resource.cc similarity index 85% rename from audio/gnomoradio/files/patch-rainbow__rdf-resource.cc rename to audio/gnomoradio/files/patch-rainbow_rdf-resource.cc index 59e878ff7179..ae4d864cb18a 100644 --- a/audio/gnomoradio/files/patch-rainbow__rdf-resource.cc +++ b/audio/gnomoradio/files/patch-rainbow_rdf-resource.cc @@ -1,6 +1,6 @@ ---- rainbow/rdf-resource.cc.orig Wed Dec 22 11:07:54 2004 -+++ rainbow/rdf-resource.cc Wed Dec 22 11:09:33 2004 -@@ -35,7 +35,7 @@ +--- rainbow/rdf-resource.cc.orig 2004-10-17 04:06:10 UTC ++++ rainbow/rdf-resource.cc +@@ -35,7 +35,7 @@ void Rainbow::RdfResource::get_and_do (c resource = ref_ptr(p->second); if (resource->downloaded) { // already downloaded map::iterator el = resource->id_map.find(id); @@ -9,7 +9,7 @@ sig.connect(slot); sig(el != resource->id_map.end() ? el->second : 0, resource); return; -@@ -47,7 +47,7 @@ +@@ -47,7 +47,7 @@ void Rainbow::RdfResource::get_and_do (c Glib::ustring host, file; unsigned short port; if (!HttpClient::parse_url(uri, host, port, file)) { @@ -18,7 +18,7 @@ sig.connect(slot); sig(0, resource); return; -@@ -55,14 +55,14 @@ +@@ -55,14 +55,14 @@ void Rainbow::RdfResource::get_and_do (c } // connect mem_fun to appropriate signal @@ -35,7 +35,7 @@ signal_->connect(slot); resource->signal_map.insert(make_pair(id, signal_)); } -@@ -190,7 +190,7 @@ +@@ -190,7 +190,7 @@ void Rainbow::RdfResource::on_downloaded error: // call all signals @@ -44,7 +44,7 @@ for (signal = signal_map.begin(); signal != signal_map.end(); ++signal) { map::iterator el = id_map.find(signal->first); signal->second->emit(el != id_map.end() ? el->second : 0, ref_ptr(this)); -@@ -204,7 +204,7 @@ +@@ -204,7 +204,7 @@ void Rainbow::RdfResource::on_downloaded void Rainbow::RdfResource::clear_signal_map () { diff --git a/audio/gnomoradio/files/patch-rainbow_sha1.h b/audio/gnomoradio/files/patch-rainbow_sha1.h index 293864ccaa8a..f5393dcada32 100644 --- a/audio/gnomoradio/files/patch-rainbow_sha1.h +++ b/audio/gnomoradio/files/patch-rainbow_sha1.h @@ -1,5 +1,5 @@ ---- rainbow/sha1.h.orig Tue Aug 16 17:32:22 2005 -+++ rainbow/sha1.h Tue Aug 16 17:33:26 2005 +--- rainbow/sha1.h.orig 2004-10-17 01:26:13 UTC ++++ rainbow/sha1.h @@ -22,7 +22,7 @@ #ifndef _SHA1_H_ #define _SHA1_H_ @@ -9,7 +9,7 @@ /* * If you do not have the ISO standard stdint.h header file, then you * must typdef the following: -@@ -57,7 +57,7 @@ +@@ -57,7 +57,7 @@ typedef struct SHA1Context uint32_t Length_High; /* Message length in bits */ /* Index into message block array */ diff --git a/audio/gnomoradio/files/patch-roboradio_audio_ogg.cc b/audio/gnomoradio/files/patch-roboradio_audio_ogg.cc index f6d6ebae9397..8e3de78994ed 100644 --- a/audio/gnomoradio/files/patch-roboradio_audio_ogg.cc +++ b/audio/gnomoradio/files/patch-roboradio_audio_ogg.cc @@ -1,6 +1,6 @@ ---- roboradio/audio/ogg.cc.orig +--- roboradio/audio/ogg.cc.orig 2004-11-06 21:55:32 UTC +++ roboradio/audio/ogg.cc -@@ -193,6 +193,7 @@ +@@ -193,6 +193,7 @@ void Roboradio::Audio::Ogg::thread_funct int device_id = ao_default_driver_id(); ao_sample_format output_fmt; diff --git a/audio/gnomoradio/files/patch-roboradio-audio_prober.cc b/audio/gnomoradio/files/patch-roboradio_audio_prober.cc similarity index 86% rename from audio/gnomoradio/files/patch-roboradio-audio_prober.cc rename to audio/gnomoradio/files/patch-roboradio_audio_prober.cc index d03d1e8c686b..707803cc2380 100644 --- a/audio/gnomoradio/files/patch-roboradio-audio_prober.cc +++ b/audio/gnomoradio/files/patch-roboradio_audio_prober.cc @@ -1,6 +1,6 @@ ---- roboradio/audio/prober.cc.orig 2007-12-06 15:39:58.000000000 +0100 -+++ roboradio/audio/prober.cc 2007-12-06 15:40:19.000000000 +0100 -@@ -21,6 +21,30 @@ +--- roboradio/audio/prober.cc.orig 2004-10-17 01:40:36 UTC ++++ roboradio/audio/prober.cc +@@ -21,6 +21,30 @@ extern "C" { #include "../mp3/esd-audio.h" } @@ -31,7 +31,7 @@ Roboradio::Audio::Prober::Prober () : activated(false) { -@@ -31,24 +55,6 @@ +@@ -31,24 +55,6 @@ Roboradio::Audio::Prober::~Prober () stop_prober(); } diff --git a/audio/gnormalize/files/patch-Makefile b/audio/gnormalize/files/patch-Makefile index 8843c6a86ad2..781f7571f942 100644 --- a/audio/gnormalize/files/patch-Makefile +++ b/audio/gnormalize/files/patch-Makefile @@ -1,5 +1,5 @@ ---- ./Makefile.orig 2008-06-11 03:03:39.000000000 +0200 -+++ ./Makefile 2014-04-06 19:58:34.694394244 +0200 +--- Makefile.orig 2008-06-11 01:03:39 UTC ++++ Makefile @@ -1,15 +1,18 @@ -PREFIX=/usr +PREFIX=/usr/local @@ -22,7 +22,7 @@ all: clean: -@@ -17,29 +20,30 @@ +@@ -17,29 +20,30 @@ distclean: clean install: all diff --git a/audio/gnuitar/files/patch-src_main.c b/audio/gnuitar/files/patch-src_main.c index b611da00e228..cf61d1e7099f 100644 --- a/audio/gnuitar/files/patch-src_main.c +++ b/audio/gnuitar/files/patch-src_main.c @@ -1,5 +1,5 @@ ---- src/main.c.orig Fri Apr 15 16:37:41 2005 -+++ src/main.c Thu Dec 14 21:41:20 2006 +--- src/main.c.orig 2005-04-15 14:37:41 UTC ++++ src/main.c @@ -109,6 +109,9 @@ #include #include @@ -10,7 +10,7 @@ #ifdef DEMO #define DEMO_MSG "\n\nThis is the demo version of the GNUitar program." \ "\nYou may download the full version as a source distribution" \ -@@ -953,9 +956,6 @@ +@@ -953,9 +956,6 @@ main(int argc, char **argv) struct sched_param p; @@ -20,7 +20,7 @@ max_priority = sched_get_priority_max(SCHED_FIFO); p.sched_priority = max_priority; -@@ -964,6 +964,12 @@ +@@ -964,6 +964,12 @@ main(int argc, char **argv) ("\nFailed to set scheduler priority. (Are you running as root?)"); printf("\nContinuing with default priority"); } diff --git a/audio/gqmpeg/files/patch-configure b/audio/gqmpeg/files/patch-configure index df69b2eeb60b..85ceb359e7ca 100644 --- a/audio/gqmpeg/files/patch-configure +++ b/audio/gqmpeg/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2003-02-02 05:27:15.000000000 +0100 -+++ configure 2014-09-25 17:43:37.000000000 +0200 -@@ -4027,10 +4027,9 @@ +--- configure.orig 2003-02-02 04:27:15 UTC ++++ configure +@@ -4027,10 +4027,9 @@ else #include "confdefs.h" #include extern int _nl_msg_cat_cntr; @@ -12,7 +12,7 @@ ; return 0; } EOF if { (eval echo configure:4037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -@@ -4416,7 +4415,6 @@ +@@ -4416,7 +4415,6 @@ else #include "confdefs.h" #include extern int _nl_msg_cat_cntr; @@ -20,7 +20,7 @@ extern #ifdef __cplusplus "C" -@@ -4424,7 +4422,7 @@ +@@ -4424,7 +4422,7 @@ extern const char *_nl_expand_alias (); int main() { bindtextdomain ("", ""); diff --git a/audio/gqmpeg/files/patch-src_ui__pixbuf__save.c b/audio/gqmpeg/files/patch-src_ui__pixbuf__save.c index 784f894f2e71..9458997c3a4b 100644 --- a/audio/gqmpeg/files/patch-src_ui__pixbuf__save.c +++ b/audio/gqmpeg/files/patch-src_ui__pixbuf__save.c @@ -1,5 +1,5 @@ ---- src/ui_pixbuf_save.c.orig 2002-03-09 20:00:13.000000000 +0100 -+++ src/ui_pixbuf_save.c 2014-12-23 23:54:56.105240001 +0100 +--- src/ui_pixbuf_save.c.orig 2002-03-09 19:00:13 UTC ++++ src/ui_pixbuf_save.c @@ -86,7 +86,7 @@ gboolean pixbuf_to_file_as_png (GdkPixbu return FALSE; } diff --git a/audio/grip/files/patch-src-gripcfg.c b/audio/grip/files/patch-src_gripcfg.c similarity index 53% rename from audio/grip/files/patch-src-gripcfg.c rename to audio/grip/files/patch-src_gripcfg.c index 37e138ce304d..e143a856c8f8 100644 --- a/audio/grip/files/patch-src-gripcfg.c +++ b/audio/grip/files/patch-src_gripcfg.c @@ -1,6 +1,6 @@ ---- src/gripcfg.c.orig 2013-05-12 21:29:57.498271858 +0100 -+++ src/gripcfg.c 2013-05-12 21:30:09.109272899 +0100 -@@ -791,7 +791,7 @@ +--- src/gripcfg.c.orig 2005-06-25 18:00:55 UTC ++++ src/gripcfg.c +@@ -791,7 +791,7 @@ gboolean LoadRipperConfig(GripInfo *ginf }; #ifdef CDPAR diff --git a/audio/grip/files/patch-src__main.c b/audio/grip/files/patch-src_main.c similarity index 67% rename from audio/grip/files/patch-src__main.c rename to audio/grip/files/patch-src_main.c index 7da04c7fd540..b509371b68e8 100644 --- a/audio/grip/files/patch-src__main.c +++ b/audio/grip/files/patch-src_main.c @@ -1,6 +1,6 @@ ---- src/main.c.orig 2010-04-13 08:46:10.000000000 -0300 -+++ src/main.c 2010-04-13 08:46:45.000000000 -0300 -@@ -164,7 +164,7 @@ +--- src/main.c.orig 2005-06-25 18:00:55 UTC ++++ src/main.c +@@ -164,7 +164,7 @@ int Cmain(int argc, char* argv[]) GNOME_PARAM_POPT_TABLE,options, GNOME_PROGRAM_STANDARD_PROPERTIES,NULL); diff --git a/audio/grip/files/patch-src_tray.c b/audio/grip/files/patch-src_tray.c index d3ec2c2a19b9..36a1b5786aed 100644 --- a/audio/grip/files/patch-src_tray.c +++ b/audio/grip/files/patch-src_tray.c @@ -1,5 +1,5 @@ ---- src/tray.c.orig 2005-01-29 19:34:17.000000000 +0100 -+++ src/tray.c 2010-12-01 22:20:00.000000000 +0100 +--- src/tray.c.orig 2005-01-29 18:34:17 UTC ++++ src/tray.c @@ -20,6 +20,7 @@ * USA */ diff --git a/audio/gsm/files/patch-Makefile b/audio/gsm/files/patch-Makefile index 1de797d31ff4..d11b2443772a 100644 --- a/audio/gsm/files/patch-Makefile +++ b/audio/gsm/files/patch-Makefile @@ -1,6 +1,6 @@ ---- ./Makefile.orig 2006-04-26 19:14:26.000000000 +0000 -+++ ./Makefile 2014-02-23 10:31:06.000000000 +0000 -@@ -43,8 +43,8 @@ +--- Makefile.orig 2006-04-26 19:14:26 UTC ++++ Makefile +@@ -43,8 +43,8 @@ WAV49 = -DWAV49 # CC = /usr/lang/acc # CCFLAGS = -c -O @@ -11,7 +11,7 @@ LD = $(CC) -@@ -59,11 +59,13 @@ +@@ -59,11 +59,13 @@ LD = $(CC) ######### Includes needed by $(CC) # LDINC = -L/usr/gnu/lib/gcc-2.1/gcc-lib/sparc-sun-sunos4.1.2/2.1 @@ -25,7 +25,7 @@ # Where do you want to install libraries, binaries, a header file # and the manual pages? -@@ -71,7 +73,7 @@ +@@ -71,7 +73,7 @@ LD = $(CC) # Leave INSTALL_ROOT empty (or just don't execute "make install") to # not install gsm and toast outside of this directory. @@ -34,7 +34,7 @@ # Where do you want to install the gsm library, header file, and manpages? # -@@ -80,7 +82,7 @@ +@@ -80,7 +82,7 @@ INSTALL_ROOT = GSM_INSTALL_ROOT = $(INSTALL_ROOT) GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib @@ -43,7 +43,7 @@ GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3 -@@ -106,6 +108,7 @@ +@@ -106,6 +108,7 @@ COMPRESS = compress COMPRESSFLAGS = # RANLIB = true RANLIB = ranlib @@ -51,7 +51,7 @@ # # You shouldn't have to configure below this line if you're porting. -@@ -129,18 +132,19 @@ +@@ -129,18 +132,19 @@ INC = $(ROOT)/inc # DEBUG = -DNDEBUG ######### Remove -DNDEBUG to enable assertions. @@ -74,7 +74,7 @@ TOAST = $(BIN)/toast UNTOAST = $(BIN)/untoast TCAT = $(BIN)/tcat -@@ -257,13 +261,15 @@ +@@ -257,13 +261,15 @@ STUFF = ChangeLog \ # Install targets GSM_INSTALL_TARGETS = \ @@ -91,7 +91,7 @@ TOAST_INSTALL_TARGETS = \ $(TOAST_INSTALL_BIN)/toast \ $(TOAST_INSTALL_BIN)/tcat \ -@@ -277,9 +283,12 @@ +@@ -277,9 +283,12 @@ TOAST_INSTALL_TARGETS = \ $(CC) $(CFLAGS) $? @-mv `$(BASENAME) $@` $@ > /dev/null 2>&1 @@ -105,7 +105,7 @@ @-echo $(ROOT): Done. tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result -@@ -299,24 +308,28 @@ +@@ -299,24 +308,28 @@ install: toastinstall gsminstall # The basic API: libgsm @@ -144,7 +144,7 @@ # The local bin and lib directories -@@ -342,62 +355,66 @@ +@@ -342,62 +355,66 @@ toastinstall: gsmuninstall: -if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \ diff --git a/audio/gsm/files/patch-inc_config.h b/audio/gsm/files/patch-inc_config.h index 196e0bba47ad..2cc75871d85b 100644 --- a/audio/gsm/files/patch-inc_config.h +++ b/audio/gsm/files/patch-inc_config.h @@ -1,5 +1,5 @@ ---- inc/config.h.orig Wed Apr 26 12:14:26 2006 -+++ inc/config.h Fri Aug 11 13:44:23 2006 +--- inc/config.h.orig 2006-04-26 19:14:26 UTC ++++ inc/config.h @@ -28,8 +28,8 @@ /*efine HAS_STRINGS_H 1 /* /usr/include/strings.h */ diff --git a/audio/gstreamer-plugins-moodbar/files/patch-analyzer_main.c b/audio/gstreamer-plugins-moodbar/files/patch-analyzer_main.c new file mode 100644 index 000000000000..e9f31d309736 --- /dev/null +++ b/audio/gstreamer-plugins-moodbar/files/patch-analyzer_main.c @@ -0,0 +1,11 @@ +--- analyzer/main.c.orig 2006-10-12 05:43:30 UTC ++++ analyzer/main.c +@@ -261,7 +261,7 @@ main (gint argc, gchar *argv[]) + }; + GOptionContext *ctx; + GError *err = NULL; +- ++ g_thread_init(NULL); + ctx = g_option_context_new ("[INFILE] - Run moodbar analyzer"); + g_option_context_add_group (ctx, gst_init_get_option_group ()); + g_option_context_add_main_entries (ctx, entries, NULL); diff --git a/audio/gstreamer-plugins-moodbar/files/patch-main.c b/audio/gstreamer-plugins-moodbar/files/patch-main.c deleted file mode 100644 index 945b9a961348..000000000000 --- a/audio/gstreamer-plugins-moodbar/files/patch-main.c +++ /dev/null @@ -1,20 +0,0 @@ -diff -crB analyzer/main.c analyzer_patched/main.c -*** analyzer/main.c 2006-10-12 07:43:30.000000000 +0200 ---- analyzer_patched/main.c 2010-02-15 20:24:57.000000000 +0100 -*************** -*** 261,267 **** - }; - GOptionContext *ctx; - GError *err = NULL; -! - ctx = g_option_context_new ("[INFILE] - Run moodbar analyzer"); - g_option_context_add_group (ctx, gst_init_get_option_group ()); - g_option_context_add_main_entries (ctx, entries, NULL); ---- 261,267 ---- - }; - GOptionContext *ctx; - GError *err = NULL; -! g_thread_init(NULL); - ctx = g_option_context_new ("[INFILE] - Run moodbar analyzer"); - g_option_context_add_group (ctx, gst_init_get_option_group ()); - g_option_context_add_main_entries (ctx, entries, NULL); diff --git a/audio/gtkguitune/files/patch-lcdview.cc b/audio/gtkguitune/files/patch-lcdview.cc index c6d63c58ac7c..230d96697dca 100644 --- a/audio/gtkguitune/files/patch-lcdview.cc +++ b/audio/gtkguitune/files/patch-lcdview.cc @@ -1,4 +1,4 @@ ---- lcdview.cc.orig +--- lcdview.cc.orig 2008-09-16 09:56:09 UTC +++ lcdview.cc @@ -23,11 +23,12 @@ diff --git a/audio/gvolwheel/files/patch-Makefile.in b/audio/gvolwheel/files/patch-Makefile.in index 9db7ea06a7c0..e3e0f4a030e9 100644 --- a/audio/gvolwheel/files/patch-Makefile.in +++ b/audio/gvolwheel/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2012-04-08 00:37:17.000000000 +0200 -+++ Makefile.in 2013-08-03 17:39:52.000000000 +0200 -@@ -315,14 +315,8 @@ +--- Makefile.in.orig 2012-04-07 22:37:17 UTC ++++ Makefile.in +@@ -315,14 +315,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = src po diff --git a/audio/gvolwheel/files/patch-src_oss.c b/audio/gvolwheel/files/patch-src_oss.c index f999b2617530..a2af139c85a6 100644 --- a/audio/gvolwheel/files/patch-src_oss.c +++ b/audio/gvolwheel/files/patch-src_oss.c @@ -1,5 +1,5 @@ ---- src/oss.c.orig 2013-02-05 00:07:25.250545453 +0400 -+++ src/oss.c 2013-02-05 00:08:55.817607467 +0400 +--- src/oss.c.orig 2012-04-07 21:18:50 UTC ++++ src/oss.c @@ -17,7 +17,8 @@ * along with this program. If not, see . */ @@ -10,7 +10,7 @@ #include #include -@@ -51,4 +52,4 @@ +@@ -51,4 +52,4 @@ void vol_backend_set(int mixer, int valu ioctl(mixer_fd, MIXER_WRITE(SOUND_MIXER_VOLUME), &vol); else if (mixer == 1) ioctl(mixer_fd, MIXER_WRITE(SOUND_MIXER_PCM), &vol); diff --git a/audio/gxmms2/files/patch-Makefile b/audio/gxmms2/files/patch-Makefile index 1a3895ba4b3d..fc3f45c9b6f7 100644 --- a/audio/gxmms2/files/patch-Makefile +++ b/audio/gxmms2/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 2009-01-04 19:30:38.000000000 +0100 -+++ Makefile 2013-12-15 22:56:10.004889065 +0100 +--- Makefile.orig 2009-01-04 18:30:38 UTC ++++ Makefile @@ -1,8 +1,6 @@ # Makefile for gxmms2 and gkrellxmms2 @@ -9,7 +9,7 @@ ALLFILES=gkrellxmms2/*.c gkrellxmms2/*.h gkrellxmms2/*.xpm gmedialib/*.c gmedialib/*.h gmedialib/*.xpm gtrackinfo/*.c gtrackinfo/*.h gxmms2src/*.c gxmms2src/*.h gxmms2src/*.xpm sdecode/*.c sdecode/*.h xmms2ctrl/*.c xmms2ctrl/*.h Makefile README COPYING CHANGELOG -@@ -13,7 +11,7 @@ +@@ -13,7 +11,7 @@ XMMS2_LIB=$(shell pkg-config xmms2-clien CFLAGS ?= -O2 CFLAGS := -Wall -fPIC $(GTK_CFLAGS) $(XMMS2_CFLAGS) -I. $(CFLAGS) diff --git a/audio/harp/files/patch-shuffle.c b/audio/harp/files/patch-shuffle.c index 4f5be5927fa9..9f25e81d1eb7 100644 --- a/audio/harp/files/patch-shuffle.c +++ b/audio/harp/files/patch-shuffle.c @@ -1,6 +1,6 @@ ---- shuffle.c.orig 2015-07-30 06:53:22.145389293 +0800 -+++ shuffle.c 2015-07-30 06:54:51.465466007 +0800 -@@ -159,10 +159,7 @@ +--- shuffle.c.orig 2015-07-24 17:35:12 UTC ++++ shuffle.c +@@ -159,10 +159,7 @@ struct zs_arg{ const unsigned int items; const unsigned int group_items; const unsigned int increment; @@ -12,7 +12,7 @@ unsigned int count; int slidemod; char *query; -@@ -260,7 +257,7 @@ +@@ -260,7 +257,7 @@ void zshuffle(unsigned int items){ struct candidate_data candlist; srandom((unsigned int)time(NULL)); diff --git a/audio/herrie/files/patch-libxspf b/audio/herrie/files/patch-libxspf index 00dc3057b205..026b737faa38 100644 --- a/audio/herrie/files/patch-libxspf +++ b/audio/herrie/files/patch-libxspf @@ -1,6 +1,6 @@ ---- configure +--- configure.orig 2008-10-14 16:20:58 UTC +++ configure -@@ -301,7 +301,7 @@ fi +@@ -288,7 +288,7 @@ fi if [ "$CFG_XSPF" != "" ] then CFLAGS="$CFLAGS -DBUILD_XSPF" @@ -9,7 +9,7 @@ SRCS="$SRCS util vfs_xspf" PLAYQ_DUMPFILE="autosave.xspf" else ---- src/conftest.c +--- src/conftest.c.orig 2008-10-14 16:20:58 UTC +++ src/conftest.c @@ -56,16 +56,10 @@ #include @@ -28,7 +28,7 @@ return (0); } ---- src/vfs_xspf.c +--- src/vfs_xspf.c.orig 2008-10-14 16:20:58 UTC +++ src/vfs_xspf.c @@ -30,7 +30,7 @@ @@ -39,7 +39,7 @@ #include "util.h" #include "vfs.h" -@@ -50,22 +50,22 @@ vfs_xspf_match(struct vfsent *ve, int isdir) +@@ -50,22 +50,22 @@ vfs_xspf_match(struct vfsent *ve, int is int vfs_xspf_populate(struct vfsent *ve) { diff --git a/audio/hydrogen-devel/files/patch-CMakeLists.txt b/audio/hydrogen-devel/files/patch-CMakeLists.txt index e43b6f3f9e35..007da737c55a 100644 --- a/audio/hydrogen-devel/files/patch-CMakeLists.txt +++ b/audio/hydrogen-devel/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2015-09-07 03:44:01 UTC +--- CMakeLists.txt.orig 2015-08-31 19:04:48 UTC +++ CMakeLists.txt @@ -107,12 +107,12 @@ ENDIF() IF(APPLE) diff --git a/audio/hydrogen-devel/files/patch-src__cli__CMakeLists.txt b/audio/hydrogen-devel/files/patch-src_cli_CMakeLists.txt similarity index 100% rename from audio/hydrogen-devel/files/patch-src__cli__CMakeLists.txt rename to audio/hydrogen-devel/files/patch-src_cli_CMakeLists.txt diff --git a/audio/hydrogen-devel/files/patch-src__core__CMakeLists.txt b/audio/hydrogen-devel/files/patch-src_core_CMakeLists.txt similarity index 100% rename from audio/hydrogen-devel/files/patch-src__core__CMakeLists.txt rename to audio/hydrogen-devel/files/patch-src_core_CMakeLists.txt diff --git a/audio/hydrogen-devel/files/patch-src__core__include__hydrogen__LashClient.h b/audio/hydrogen-devel/files/patch-src_core_include_hydrogen_LashClient.h similarity index 100% rename from audio/hydrogen-devel/files/patch-src__core__include__hydrogen__LashClient.h rename to audio/hydrogen-devel/files/patch-src_core_include_hydrogen_LashClient.h diff --git a/audio/hydrogen-devel/files/patch-src__gui__CMakeLists.txt b/audio/hydrogen-devel/files/patch-src_gui_CMakeLists.txt similarity index 100% rename from audio/hydrogen-devel/files/patch-src__gui__CMakeLists.txt rename to audio/hydrogen-devel/files/patch-src_gui_CMakeLists.txt diff --git a/audio/hydrogen-devel/files/patch-src__player__CMakeLists.txt b/audio/hydrogen-devel/files/patch-src_player_CMakeLists.txt similarity index 100% rename from audio/hydrogen-devel/files/patch-src__player__CMakeLists.txt rename to audio/hydrogen-devel/files/patch-src_player_CMakeLists.txt diff --git a/audio/hydrogen-devel/files/patch-src__synth__CMakeLists.txt b/audio/hydrogen-devel/files/patch-src_synth_CMakeLists.txt similarity index 100% rename from audio/hydrogen-devel/files/patch-src__synth__CMakeLists.txt rename to audio/hydrogen-devel/files/patch-src_synth_CMakeLists.txt diff --git a/audio/hydrogen/files/patch-cmake__FindHelper.cmake b/audio/hydrogen/files/patch-cmake_FindHelper.cmake similarity index 100% rename from audio/hydrogen/files/patch-cmake__FindHelper.cmake rename to audio/hydrogen/files/patch-cmake_FindHelper.cmake diff --git a/audio/hydrogen/files/patch-src__cli__CMakeLists.txt b/audio/hydrogen/files/patch-src_cli_CMakeLists.txt similarity index 100% rename from audio/hydrogen/files/patch-src__cli__CMakeLists.txt rename to audio/hydrogen/files/patch-src_cli_CMakeLists.txt diff --git a/audio/hydrogen/files/patch-src__gui__CMakeLists.txt b/audio/hydrogen/files/patch-src_gui_CMakeLists.txt similarity index 100% rename from audio/hydrogen/files/patch-src__gui__CMakeLists.txt rename to audio/hydrogen/files/patch-src_gui_CMakeLists.txt diff --git a/audio/hydrogen/files/patch-src__player__CMakeLists.txt b/audio/hydrogen/files/patch-src_player_CMakeLists.txt similarity index 100% rename from audio/hydrogen/files/patch-src__player__CMakeLists.txt rename to audio/hydrogen/files/patch-src_player_CMakeLists.txt diff --git a/audio/hydrogen/files/patch-src__synth__CMakeLists.txt b/audio/hydrogen/files/patch-src_synth_CMakeLists.txt similarity index 100% rename from audio/hydrogen/files/patch-src__synth__CMakeLists.txt rename to audio/hydrogen/files/patch-src_synth_CMakeLists.txt diff --git a/audio/icecast-kh/files/patch-Makefile.in b/audio/icecast-kh/files/patch-conf_Makefile.in similarity index 52% rename from audio/icecast-kh/files/patch-Makefile.in rename to audio/icecast-kh/files/patch-conf_Makefile.in index 763310470585..b91bcdfe5ec5 100644 --- a/audio/icecast-kh/files/patch-Makefile.in +++ b/audio/icecast-kh/files/patch-conf_Makefile.in @@ -1,12 +1,12 @@ ---- conf/Makefile.in.orig 2008-05-30 08:58:57.000000000 +0900 -+++ conf/Makefile.in 2010-05-14 17:36:16.000000000 +0900 -@@ -407,8 +407,7 @@ - +--- conf/Makefile.in.orig 2014-02-18 01:46:17 UTC ++++ conf/Makefile.in +@@ -459,8 +459,7 @@ uninstall-am: uninstall-docDATA + install-data-hook: $(mkinstalldirs) $(DESTDIR)$(sysconfdir) - test -f $(DESTDIR)$(sysconfdir)/icecast.xml || \ - $(INSTALL_DATA) icecast.xml.dist $(DESTDIR)$(sysconfdir)/icecast.xml + $(INSTALL_DATA) icecast.xml.dist $(DESTDIR)$(sysconfdir)/icecast.xml.sample - icecast.xml.dist: $(srcdir)/icecast.xml.in - $(edit) $(srcdir)/icecast.xml.in > icecast.xml.dist + uninstall-hook: + -rm -f $(DESTDIR)$(sysconfdir)/icecast.xml diff --git a/audio/icecast-kh/files/patch-configure b/audio/icecast-kh/files/patch-configure index c87d7b421805..32f5503671fc 100644 --- a/audio/icecast-kh/files/patch-configure +++ b/audio/icecast-kh/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2012-09-12 09:17:21.000000000 +0700 -+++ configure 2013-02-24 02:48:14.000000000 +0700 -@@ -793,6 +793,7 @@ +--- configure.orig 2014-02-18 01:46:17 UTC ++++ configure +@@ -793,6 +793,7 @@ with_theora with_speex with_curl with_curl_config @@ -8,7 +8,7 @@ enable_yp with_openssl ' -@@ -17610,6 +17611,16 @@ +@@ -17648,6 +17649,16 @@ $as_echo "$as_me: WARNING: Speex support fi @@ -25,7 +25,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kate_decode_init in -lkate" >&5 $as_echo_n "checking for kate_decode_init in -lkate... " >&6; } -@@ -17707,6 +17718,7 @@ +@@ -17745,6 +17756,7 @@ $as_echo "#define HAVE_KATE 1" >>confdef fi #ICECAST_OPTIONAL="$ICECAST_OPTIONAL format_kate.o" diff --git a/audio/icecast2/files/patch-conf-Makefile.in b/audio/icecast2/files/patch-conf_Makefile.in similarity index 78% rename from audio/icecast2/files/patch-conf-Makefile.in rename to audio/icecast2/files/patch-conf_Makefile.in index 6549fe5eff62..d515eed5ad6a 100644 --- a/audio/icecast2/files/patch-conf-Makefile.in +++ b/audio/icecast2/files/patch-conf_Makefile.in @@ -1,7 +1,7 @@ ---- conf/Makefile.in.orig 2008-05-29 23:58:57 UTC +--- conf/Makefile.in.orig 2016-01-04 21:07:07 UTC +++ conf/Makefile.in -@@ -407,8 +407,7 @@ - +@@ -539,8 +539,7 @@ uninstall-am: uninstall-docDATA + install-data-hook: $(mkinstalldirs) $(DESTDIR)$(sysconfdir) - test -f $(DESTDIR)$(sysconfdir)/icecast.xml || \ diff --git a/audio/id3ren/files/patch-Makefile b/audio/id3ren/files/patch-Makefile index 951d41b7ace6..32610598805e 100644 --- a/audio/id3ren/files/patch-Makefile +++ b/audio/id3ren/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Tue Mar 6 02:59:34 2001 -+++ Makefile Fri Jan 7 09:56:53 2005 +--- Makefile.orig 2012-05-15 20:31:03 UTC ++++ Makefile @@ -1,12 +1,12 @@ all: - make -C src all diff --git a/audio/id3ren/files/patch-man__Makefile b/audio/id3ren/files/patch-man_Makefile similarity index 68% rename from audio/id3ren/files/patch-man__Makefile rename to audio/id3ren/files/patch-man_Makefile index d004277400af..70e46829965f 100644 --- a/audio/id3ren/files/patch-man__Makefile +++ b/audio/id3ren/files/patch-man_Makefile @@ -1,5 +1,5 @@ ---- man/Makefile.orig Fri Jan 7 09:53:38 2005 -+++ man/Makefile Fri Jan 7 09:53:54 2005 +--- man/Makefile.orig 2012-05-15 20:31:03 UTC ++++ man/Makefile @@ -1,6 +1,6 @@ -RM = rm -f -INSTALL = install -m 755 diff --git a/audio/id3ren/files/patch-src_Makefile b/audio/id3ren/files/patch-src_Makefile index 759ef05df597..4034c47a10d2 100644 --- a/audio/id3ren/files/patch-src_Makefile +++ b/audio/id3ren/files/patch-src_Makefile @@ -1,5 +1,5 @@ ---- src/Makefile.orig Fri Jan 7 10:08:02 2005 -+++ src/Makefile Fri Jan 7 10:08:30 2005 +--- src/Makefile.orig 2012-05-15 20:31:03 UTC ++++ src/Makefile @@ -1,9 +1,10 @@ CFLAGSDEBUG = -g -O2 -Wall -DDEBUG -CFLAGS = -s -O2 -Wall @@ -16,7 +16,7 @@ INSTALL_NAME = id3ren SOURCES = id3ren.c id3tag.c id3file.c id3misc.c -@@ -12,7 +13,7 @@ +@@ -12,7 +13,7 @@ INCLUDES = id3ren.h id3tag.h id3file.h i all: ${INSTALL_NAME} ${INSTALL_NAME}: ${SOURCES} ${INCLUDES} diff --git a/audio/id3ren/files/patch-src_id3tag.c b/audio/id3ren/files/patch-src_id3tag.c index 961ae28dbda6..cbeab83878cc 100644 --- a/audio/id3ren/files/patch-src_id3tag.c +++ b/audio/id3ren/files/patch-src_id3tag.c @@ -1,6 +1,6 @@ ---- src/id3tag.c.orig Fri Jan 7 09:32:59 2005 -+++ src/id3tag.c Fri Jan 7 09:33:14 2005 -@@ -369,6 +369,7 @@ +--- src/id3tag.c.orig 2012-05-15 20:31:03 UTC ++++ src/id3tag.c +@@ -363,6 +363,7 @@ get_tag_string (int size, char *def_stri return TRUE; } diff --git a/audio/id3v2/files/patch-Makefile b/audio/id3v2/files/patch-Makefile index 28130bda2f46..e66f1f77ccae 100644 --- a/audio/id3v2/files/patch-Makefile +++ b/audio/id3v2/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 2010-03-27 07:28:34.000000000 +0800 -+++ Makefile 2010-05-15 02:52:55.000000000 +0800 +--- Makefile.orig 2010-03-26 23:28:34 UTC ++++ Makefile @@ -1,20 +1,21 @@ -all: id3v2 +all: clean id3v2 @@ -30,7 +30,7 @@ clean: rm -f id3v2 create_map core *.o -@@ -25,4 +26,5 @@ +@@ -25,4 +26,5 @@ tarball: --exclude=id3v2-${VERSION}/id3v2-${VERSION} \ id3v2-${VERSION} rm id3v2-${VERSION} diff --git a/audio/jack-rack/files/patch-fix_with_gtk-2.12 b/audio/jack-rack/files/patch-fix_with_gtk-2.12 index b615e96d10e7..2638a859f318 100644 --- a/audio/jack-rack/files/patch-fix_with_gtk-2.12 +++ b/audio/jack-rack/files/patch-fix_with_gtk-2.12 @@ -1,6 +1,6 @@ ---- src/Makefile.in.orig 2007-10-25 11:55:32.000000000 -0500 -+++ src/Makefile.in 2007-10-25 11:55:48.000000000 -0500 -@@ -265,12 +265,7 @@ +--- src/Makefile.in.orig 2007-11-26 22:24:06 UTC ++++ src/Makefile.in +@@ -261,12 +261,7 @@ jack_rack_CFLAGS = \ $(XML_CFLAGS) \ -DPKGDATADIR=\"$(pkgdatadir)\" \ -DPIXMAPDIR=\"$(pixmapdir)\" \ diff --git a/audio/jack-rack/files/patch-src_plugin_slot_callbacks.c b/audio/jack-rack/files/patch-src_plugin__slot__callbacks.c similarity index 65% rename from audio/jack-rack/files/patch-src_plugin_slot_callbacks.c rename to audio/jack-rack/files/patch-src_plugin__slot__callbacks.c index 868da64d3097..f88164d0a52c 100644 --- a/audio/jack-rack/files/patch-src_plugin_slot_callbacks.c +++ b/audio/jack-rack/files/patch-src_plugin__slot__callbacks.c @@ -1,6 +1,6 @@ ---- src/plugin_slot_callbacks.c.orig 2008-08-27 16:45:43.000000000 +0200 -+++ src/plugin_slot_callbacks.c 2008-08-27 16:49:19.000000000 +0200 -@@ -109,6 +109,7 @@ +--- src/plugin_slot_callbacks.c.orig 2007-11-18 13:13:49 UTC ++++ src/plugin_slot_callbacks.c +@@ -109,6 +109,7 @@ slot_ablise_cb (GtkWidget * button, GdkE ui = plugin_slot->jack_rack->ui; @@ -8,7 +8,7 @@ g_object_set_data (G_OBJECT (ui->midi_menu_item), "jack-rack-ctrl-type", GINT_TO_POINTER(2/*PLUGIN_ENABLE_CONTROL*/)); -@@ -117,6 +118,7 @@ +@@ -117,6 +118,7 @@ slot_ablise_cb (GtkWidget * button, GdkE plugin_slot); gtk_menu_popup (GTK_MENU (ui->midi_menu), NULL, NULL, NULL, NULL, event->button, event->time); diff --git a/audio/jack/files/patch-drivers-dummy-dummy_driver.c b/audio/jack/files/patch-drivers_dummy_dummy__driver.c similarity index 100% rename from audio/jack/files/patch-drivers-dummy-dummy_driver.c rename to audio/jack/files/patch-drivers_dummy_dummy__driver.c diff --git a/audio/jack/files/patch-drivers-dummy-dummy_driver.h b/audio/jack/files/patch-drivers_dummy_dummy__driver.h similarity index 100% rename from audio/jack/files/patch-drivers-dummy-dummy_driver.h rename to audio/jack/files/patch-drivers_dummy_dummy__driver.h diff --git a/audio/jack/files/patch-drivers-oss-oss_driver.c b/audio/jack/files/patch-drivers_oss_oss__driver.c similarity index 100% rename from audio/jack/files/patch-drivers-oss-oss_driver.c rename to audio/jack/files/patch-drivers_oss_oss__driver.c diff --git a/audio/jack/files/patch-libjack-client.c b/audio/jack/files/patch-libjack_client.c similarity index 100% rename from audio/jack/files/patch-libjack-client.c rename to audio/jack/files/patch-libjack_client.c diff --git a/audio/juke/files/patch-src_conf.c b/audio/juke/files/patch-src_conf.c index 46bb6ec6ff3b..629a3c5ccf75 100644 --- a/audio/juke/files/patch-src_conf.c +++ b/audio/juke/files/patch-src_conf.c @@ -1,6 +1,6 @@ ---- ../juke.orig/src/conf.c Thu Apr 15 21:44:53 1999 -+++ ./src/conf.c Sun May 2 12:18:07 1999 -@@ -207,11 +207,11 @@ +--- src/conf.c.orig 2000-03-06 20:43:13 UTC ++++ src/conf.c +@@ -207,11 +207,11 @@ void config_load (struct CONFIG *cfg) return; } } diff --git a/audio/juke/files/patch-src_conf.h b/audio/juke/files/patch-src_conf.h index 42913e34dfa1..2ea436b9ff8f 100644 --- a/audio/juke/files/patch-src_conf.h +++ b/audio/juke/files/patch-src_conf.h @@ -1,5 +1,5 @@ ---- ../juke.orig/src/conf.h Thu Apr 15 21:44:53 1999 -+++ ./src/conf.h Sun May 2 12:16:58 1999 +--- src/conf.h.orig 1999-04-07 17:47:53 UTC ++++ src/conf.h @@ -1,6 +1,11 @@ #define CFG_ARGS 10 #define CFG_STRLEN 100 diff --git a/audio/kexis/files/patch-Makefile b/audio/kexis/files/patch-Makefile index 51df7bc2456c..189c8f892892 100644 --- a/audio/kexis/files/patch-Makefile +++ b/audio/kexis/files/patch-Makefile @@ -1,5 +1,5 @@ ---- ./Makefile.orig Sat Jul 22 00:55:52 2006 -+++ ./Makefile Sat Jul 22 00:56:34 2006 +--- Makefile.orig 2000-09-22 20:12:48 UTC ++++ Makefile @@ -1,7 +1,5 @@ -DESTDIR = SOURCE=encode.c decode.c header.c predictor.c bits.c rice.c kexis.c diff --git a/audio/kid3-kde4/files/patch-CMakeLists.txt b/audio/kid3-kde4/files/patch-CMakeLists.txt index 732ed7f07bad..0fdca02e14d2 100644 --- a/audio/kid3-kde4/files/patch-CMakeLists.txt +++ b/audio/kid3-kde4/files/patch-CMakeLists.txt @@ -1,8 +1,8 @@ ---- ./CMakeLists.txt.orig 2013-10-29 17:19:33.000000000 +0000 -+++ ./CMakeLists.txt 2013-11-12 15:45:23.799504953 +0000 -@@ -110,8 +110,8 @@ - set(WITH_TRANSLATIONSDIR_DEFAULT "share/kid3-qt/translations") +--- CMakeLists.txt.orig 2015-09-30 06:40:08 UTC ++++ CMakeLists.txt +@@ -137,8 +137,8 @@ else (APPLE) endif (BUILD_KDE_APP OR BUILD_SHARED_LIBS) + set(WITH_QMLDIR_DEFAULT "share/kid3/qml") set(WITH_BINDIR_DEFAULT "bin") - set(WITH_LIBDIR_DEFAULT "lib${LIB_SUFFIX}/kid3") - set(WITH_PLUGINSDIR_DEFAULT "${WITH_LIBDIR_DEFAULT}/plugins") diff --git a/audio/kio-audiocd/files/patch-audiocd.cpp b/audio/kio-audiocd/files/patch-audiocd.cpp index 30a560b26b72..7940aadd67c5 100644 --- a/audio/kio-audiocd/files/patch-audiocd.cpp +++ b/audio/kio-audiocd/files/patch-audiocd.cpp @@ -1,6 +1,6 @@ ---- audiocd.cpp.orig 2010-06-06 08:15:20.000000000 -0400 -+++ audiocd.cpp 2010-06-06 08:18:01.000000000 -0400 -@@ -229,20 +229,21 @@ +--- audiocd.cpp.orig 2014-10-09 07:07:27 UTC ++++ audiocd.cpp +@@ -228,20 +228,21 @@ static void setDeviceToCd(KCompactDisc * // name associated with the device, which throws the rest of audiocd // for a loop. // @@ -24,7 +24,7 @@ } else { -@@ -250,13 +251,14 @@ +@@ -249,13 +250,14 @@ static void setDeviceToCd(KCompactDisc * // circumstances, so build a representation from // the unit number and SCSI device name. // diff --git a/audio/kmix/files/extrapatch-no_alsa b/audio/kmix/files/extrapatch-no_alsa index ccf4476743fd..46157620bddf 100644 --- a/audio/kmix/files/extrapatch-no_alsa +++ b/audio/kmix/files/extrapatch-no_alsa @@ -1,17 +1,17 @@ ---- CMakeLists.txt~ 2012-06-29 17:55:35.000000000 -0300 -+++ CMakeLists.txt 2012-06-29 17:56:25.000000000 -0300 -@@ -6,7 +6,7 @@ - include(KDE4Defaults) - include(MacroLibrary) +--- CMakeLists.txt.orig 2014-07-16 08:24:17 UTC ++++ CMakeLists.txt +@@ -9,7 +9,7 @@ include(MacroLibrary) + # Do not yet REQUIRE Phonon. Hint: As long as we do not find_package(), ${KDE4_PHONON_LIBS} will be empty below, but that should not hurt. + #find_package(Phonon REQUIRED) -find_package(Alsa) +find_file(CONFIG_ALSA_H_CMAKE config-alsa.h.cmake ${CMAKE_MODULE_PATH}) - macro_optional_find_package(PulseAudio "0.9.12") - macro_log_feature(PULSEAUDIO_FOUND "PulseAudio" "PulseAudio Audio Server" "http://www.pulseaudio.org/" FALSE "0.9.12" "libpulse is needed to let KMix control PulseAudio") -@@ -14,7 +14,7 @@ - macro_optional_find_package(Canberra) - macro_log_feature(CANBERRA_FOUND "libcanberra" "libcanberra audio library" "http://0pointer.de/lennart/projects/libcanberra/" FALSE "" "libcanberra is needed for kmix sound feedback") + set(PA_VER "0.9.16") + macro_optional_find_package(PulseAudio "${PA_VER}") +@@ -20,7 +20,7 @@ macro_optional_find_package(Canberra) + macro_log_feature(CANBERRA_FOUND "libcanberra" "libcanberra audio library" + "http://0pointer.de/lennart/projects/libcanberra/" FALSE "" "libcanberra is needed for kmix sound feedback") -alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h) +configure_file(${CONFIG_ALSA_H_CMAKE} ${CMAKE_BINARY_DIR}/config-alsa.h) diff --git a/audio/kmix/files/patch-mixer_oss b/audio/kmix/files/patch-backends_mixer__oss.cpp similarity index 100% rename from audio/kmix/files/patch-mixer_oss rename to audio/kmix/files/patch-backends_mixer__oss.cpp diff --git a/audio/kscd/files/extrapatch-no_alsa b/audio/kscd/files/extrapatch-no_alsa index d3e61dcc5379..babc3c26609a 100644 --- a/audio/kscd/files/extrapatch-no_alsa +++ b/audio/kscd/files/extrapatch-no_alsa @@ -1,6 +1,6 @@ ---- CMakeLists.txt~ 2012-06-29 17:23:16.000000000 -0300 -+++ CMakeLists.txt 2012-06-29 17:24:13.000000000 -0300 -@@ -8,8 +8,8 @@ +--- CMakeLists.txt.orig 2014-07-16 08:24:20 UTC ++++ CMakeLists.txt +@@ -8,8 +8,8 @@ include(KDE4Defaults) include(MacroLibrary) include_directories(${QT_INCLUDES} ${KDE4_INCLUDES}) @@ -9,5 +9,5 @@ +find_file(CONFIG_ALSA_H_CMAKE config-alsa.h.cmake ${CMAKE_MODULE_PATH}) +configure_file(${CONFIG_ALSA_H_CMAKE} ${CMAKE_BINARY_DIR}/config-alsa.h) + find_package(MusicBrainz3 REQUIRED) - # If these two fail, behavior falls back to pre-git-migration diff --git a/audio/ladspa/files/patch-applyplugin.c b/audio/ladspa/files/patch-src_applyplugin.c similarity index 69% rename from audio/ladspa/files/patch-applyplugin.c rename to audio/ladspa/files/patch-src_applyplugin.c index 583387a2f40d..96274d17dda6 100644 --- a/audio/ladspa/files/patch-applyplugin.c +++ b/audio/ladspa/files/patch-src_applyplugin.c @@ -1,5 +1,5 @@ ---- src/applyplugin.c.orig Sat May 11 23:31:00 2002 -+++ src/applyplugin.c Sat May 11 23:31:09 2002 +--- src/applyplugin.c.orig 2007-11-06 10:52:56 UTC ++++ src/applyplugin.c @@ -6,7 +6,7 @@ /*****************************************************************************/ diff --git a/audio/lame/files/patch-configure b/audio/lame/files/patch-configure index eeb10adabc92..80059d032995 100644 --- a/audio/lame/files/patch-configure +++ b/audio/lame/files/patch-configure @@ -1,29 +1,6 @@ ---- configure.in.orig 2012-02-28 19:50:27.000000000 +0100 -+++ configure.in 2016-01-25 20:15:46.034842000 +0100 -@@ -96,9 +96,19 @@ - sys/soundcard.h \ - sys/time.h \ - unistd.h \ -- xmmintrin.h \ - linux/soundcard.h) - -+dnl Checks for actually working SSE intrinsics -+AC_MSG_CHECKING(working SSE intrinsics) -+AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM( -+ [[#include ]], -+ [[_mm_sfence();]])], -+ [AC_DEFINE([HAVE_XMMINTRIN_H], [1], [Define if SSE intrinsics work.]) -+ ac_cv_header_xmmintrin_h=yes], -+ [ac_cv_header_xmmintrin_h=no]) -+AC_MSG_RESULT(${ac_cv_header_xmmintrin_h}) -+ - dnl Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST - AC_C_INLINE ---- configure.orig 2012-02-28 19:54:37.000000000 +0100 -+++ configure 2016-01-25 20:16:07.429512000 +0100 -@@ -11922,7 +11918,6 @@ +--- configure.orig 2012-02-28 18:54:37 UTC ++++ configure +@@ -11922,7 +11922,6 @@ for ac_header in \ sys/soundcard.h \ sys/time.h \ unistd.h \ @@ -31,7 +8,7 @@ linux/soundcard.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -@@ -11937,6 +11932,31 @@ +@@ -11937,6 +11936,31 @@ fi done @@ -63,3 +40,26 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 $as_echo_n "checking for an ANSI C-conforming const... " >&6; } if ${ac_cv_c_const+:} false; then : +--- configure.in.orig 2012-02-28 18:50:27 UTC ++++ configure.in +@@ -96,9 +96,19 @@ AC_CHECK_HEADERS( \ + sys/soundcard.h \ + sys/time.h \ + unistd.h \ +- xmmintrin.h \ + linux/soundcard.h) + ++dnl Checks for actually working SSE intrinsics ++AC_MSG_CHECKING(working SSE intrinsics) ++AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[#include ]], ++ [[_mm_sfence();]])], ++ [AC_DEFINE([HAVE_XMMINTRIN_H], [1], [Define if SSE intrinsics work.]) ++ ac_cv_header_xmmintrin_h=yes], ++ [ac_cv_header_xmmintrin_h=no]) ++AC_MSG_RESULT(${ac_cv_header_xmmintrin_h}) ++ + dnl Checks for typedefs, structures, and compiler characteristics. + AC_C_CONST + AC_C_INLINE diff --git a/audio/lash/files/patch-lashd-client_event.c b/audio/lash/files/patch-lashd_client__event.c similarity index 62% rename from audio/lash/files/patch-lashd-client_event.c rename to audio/lash/files/patch-lashd_client__event.c index cc8e2854c728..134f68655065 100644 --- a/audio/lash/files/patch-lashd-client_event.c +++ b/audio/lash/files/patch-lashd_client__event.c @@ -1,6 +1,6 @@ ---- lashd/client_event.c.orig 2007-09-17 19:10:14.000000000 +0200 -+++ lashd/client_event.c 2007-09-17 19:10:50.000000000 +0200 -@@ -185,6 +185,7 @@ +--- lashd/client_event.c.orig 2007-01-13 22:05:54 UTC ++++ lashd/client_event.c +@@ -185,6 +185,7 @@ server_lash_event_project_add(server_t * project_set_name(project, name); } @@ -8,7 +8,7 @@ err = gethostname(server_name, MAXHOSTNAMELEN); if (err == -1) { fprintf(stderr, -@@ -192,6 +193,9 @@ +@@ -192,6 +193,9 @@ server_lash_event_project_add(server_t * __FUNCTION__, strerror(errno)); strcpy(server_name, "localhost"); } diff --git a/audio/lash/files/patch-lashd-conn_mgr.c b/audio/lash/files/patch-lashd_conn__mgr.c similarity index 60% rename from audio/lash/files/patch-lashd-conn_mgr.c rename to audio/lash/files/patch-lashd_conn__mgr.c index 38042102d93e..40bc4b620b12 100644 --- a/audio/lash/files/patch-lashd-conn_mgr.c +++ b/audio/lash/files/patch-lashd_conn__mgr.c @@ -1,6 +1,6 @@ ---- lashd/conn_mgr.c.orig 2008-01-02 20:26:00.000000000 +0100 -+++ lashd/conn_mgr.c 2008-01-02 20:27:11.000000000 +0100 -@@ -759,7 +759,11 @@ +--- lashd/conn_mgr.c.orig 2007-04-08 21:18:23 UTC ++++ lashd/conn_mgr.c +@@ -759,7 +759,11 @@ conn_mgr_recv_run(void *data) fprintf(stderr, "%s: error calling select(): %s\n", __FUNCTION__, strerror(errno)); diff --git a/audio/lash/files/patch-lashd-store.c b/audio/lash/files/patch-lashd_store.c similarity index 84% rename from audio/lash/files/patch-lashd-store.c rename to audio/lash/files/patch-lashd_store.c index 0558601dec7b..9baee6d80f76 100644 --- a/audio/lash/files/patch-lashd-store.c +++ b/audio/lash/files/patch-lashd_store.c @@ -1,6 +1,6 @@ ---- lashd/store.c.orig Sat Jan 13 15:45:09 2007 -+++ lashd/store.c Sat Jan 13 15:45:12 2007 -@@ -35,6 +35,31 @@ +--- lashd/store.c.orig 2007-01-13 22:08:54 UTC ++++ lashd/store.c +@@ -36,6 +36,31 @@ #define STORE_INFO_FILE ".store_info" diff --git a/audio/lash/files/patch-liblash-lash.c b/audio/lash/files/patch-liblash_lash.c similarity index 68% rename from audio/lash/files/patch-liblash-lash.c rename to audio/lash/files/patch-liblash_lash.c index 4fd55d545f19..d6d9279625fc 100644 --- a/audio/lash/files/patch-liblash-lash.c +++ b/audio/lash/files/patch-liblash_lash.c @@ -1,5 +1,5 @@ ---- liblash/lash.c.orig Tue May 22 20:13:00 2007 -+++ liblash/lash.c Tue May 22 20:13:13 2007 +--- liblash/lash.c.orig 2007-03-09 15:34:40 UTC ++++ liblash/lash.c @@ -23,6 +23,8 @@ #include #include diff --git a/audio/last.fm/files/patch-LastFM.pro b/audio/last.fm/files/patch-LastFM.pro index 519abaf586e0..dc3250bbb401 100644 --- a/audio/last.fm/files/patch-LastFM.pro +++ b/audio/last.fm/files/patch-LastFM.pro @@ -1,6 +1,6 @@ ---- LastFM.pro.orig 2012-12-02 14:23:24.000000000 +0100 -+++ LastFM.pro 2012-12-02 14:23:37.000000000 +0100 -@@ -37,7 +37,7 @@ +--- LastFM.pro.orig 2010-09-20 10:43:11 UTC ++++ LastFM.pro +@@ -37,7 +37,7 @@ mac { SUBDIRS -= src/mediadevices/ipod } diff --git a/audio/last.fm/files/patch-src-output-alsa-playback-alsaaudio.cpp b/audio/last.fm/files/patch-src-output-alsa-playback-alsaaudio.cpp deleted file mode 100644 index 278496f231e1..000000000000 --- a/audio/last.fm/files/patch-src-output-alsa-playback-alsaaudio.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/output/alsa-playback/alsaaudio.cpp.orig 2014-08-15 14:23:25.000000000 +0200 -+++ src/output/alsa-playback/alsaaudio.cpp 2014-08-15 16:29:32.000000000 +0200 -@@ -798,8 +798,6 @@ - { - case -EPIPE: - return xrun_recover(); -- case -ESTRPIPE: -- return suspend_recover(); - } - - return err; diff --git a/audio/last.fm/files/patch-src-output-alsa-playback-xconvert.c b/audio/last.fm/files/patch-src-output-alsa-playback-xconvert.c deleted file mode 100644 index 385a3b6a823c..000000000000 --- a/audio/last.fm/files/patch-src-output-alsa-playback-xconvert.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/output/alsa-playback/xconvert.c.orig 2012-12-02 14:30:50.000000000 +0100 -+++ src/output/alsa-playback/xconvert.c 2012-12-02 14:33:58.000000000 +0100 -@@ -57,6 +57,7 @@ - - #endif - -+#define uint size_t - - struct buffer { - void *buffer; diff --git a/audio/last.fm/files/patch-src-AudioController.cpp b/audio/last.fm/files/patch-src_AudioController.cpp similarity index 74% rename from audio/last.fm/files/patch-src-AudioController.cpp rename to audio/last.fm/files/patch-src_AudioController.cpp index fa671556dec2..052ad3dd70c5 100644 --- a/audio/last.fm/files/patch-src-AudioController.cpp +++ b/audio/last.fm/files/patch-src_AudioController.cpp @@ -1,6 +1,6 @@ ---- src/AudioController.cpp.orig 2007-12-18 15:18:20.000000000 +0100 -+++ src/AudioController.cpp 2009-11-04 19:22:00.000000000 +0100 -@@ -168,13 +168,7 @@ +--- src/AudioController.cpp.orig 2016-07-26 15:06:09 UTC ++++ src/AudioController.cpp +@@ -168,13 +168,7 @@ AudioControllerThread::loadPlugins() m_transcode->setBufferCapacity( kDecodedBufferMinSize ); diff --git a/audio/last.fm/files/patch-src__lastfmapplication.cpp b/audio/last.fm/files/patch-src_lastfmapplication.cpp similarity index 76% rename from audio/last.fm/files/patch-src__lastfmapplication.cpp rename to audio/last.fm/files/patch-src_lastfmapplication.cpp index 036369437ed7..02cd05aade25 100644 --- a/audio/last.fm/files/patch-src__lastfmapplication.cpp +++ b/audio/last.fm/files/patch-src_lastfmapplication.cpp @@ -1,4 +1,4 @@ ---- src/lastfmapplication.cpp.orig +--- src/lastfmapplication.cpp.orig 2016-07-26 15:06:09 UTC +++ src/lastfmapplication.cpp @@ -55,6 +55,10 @@ #include diff --git a/audio/last.fm/files/patch-src-libFingerprint-fplib-src-FloatingAverage.h b/audio/last.fm/files/patch-src_libFingerprint_fplib_src_FloatingAverage.h similarity index 56% rename from audio/last.fm/files/patch-src-libFingerprint-fplib-src-FloatingAverage.h rename to audio/last.fm/files/patch-src_libFingerprint_fplib_src_FloatingAverage.h index 17ebdcdc5aa4..cf9304065423 100644 --- a/audio/last.fm/files/patch-src-libFingerprint-fplib-src-FloatingAverage.h +++ b/audio/last.fm/files/patch-src_libFingerprint_fplib_src_FloatingAverage.h @@ -1,6 +1,6 @@ ---- src/libFingerprint/fplib/src/FloatingAverage.h.orig 2007-12-18 15:18:19.000000000 +0100 -+++ src/libFingerprint/fplib/src/FloatingAverage.h 2012-11-25 13:23:10.000000000 +0100 -@@ -78,6 +78,7 @@ +--- src/libFingerprint/fplib/src/FloatingAverage.h.orig 2016-07-26 15:06:09 UTC ++++ src/libFingerprint/fplib/src/FloatingAverage.h +@@ -78,6 +78,7 @@ public: { T real_sum = 0; const T* pCircularBuffer = m_values.get_buffer(); @@ -8,5 +8,3 @@ for ( int i = 0; i < size; ++i ) real_sum += pCircularBuffer[i]; return abs(real_sum - m_sum) / this->size(); - - diff --git a/audio/last.fm/files/patch-src-libUnicorn-Settings.h b/audio/last.fm/files/patch-src_libUnicorn_Settings.h similarity index 53% rename from audio/last.fm/files/patch-src-libUnicorn-Settings.h rename to audio/last.fm/files/patch-src_libUnicorn_Settings.h index 76717ae8d82f..36d94e704d17 100644 --- a/audio/last.fm/files/patch-src-libUnicorn-Settings.h +++ b/audio/last.fm/files/patch-src_libUnicorn_Settings.h @@ -1,6 +1,6 @@ ---- src/libUnicorn/Settings.h.orig 2011-08-28 17:30:32.000000000 +0200 -+++ src/libUnicorn/Settings.h 2011-08-28 17:31:03.000000000 +0200 -@@ -105,7 +105,7 @@ +--- src/libUnicorn/Settings.h.orig 2016-07-26 15:06:09 UTC ++++ src/libUnicorn/Settings.h +@@ -105,7 +105,7 @@ protected: public: MyQSettings( const UserSettings* const s ) { diff --git a/audio/last.fm/files/patch-src__libUnicorn__TrackInfo.h b/audio/last.fm/files/patch-src_libUnicorn_TrackInfo.h similarity index 72% rename from audio/last.fm/files/patch-src__libUnicorn__TrackInfo.h rename to audio/last.fm/files/patch-src_libUnicorn_TrackInfo.h index 89a3f4e79dc9..1164608f704e 100644 --- a/audio/last.fm/files/patch-src__libUnicorn__TrackInfo.h +++ b/audio/last.fm/files/patch-src_libUnicorn_TrackInfo.h @@ -1,4 +1,4 @@ ---- src/libUnicorn/TrackInfo.h.orig +--- src/libUnicorn/TrackInfo.h.orig 2016-07-26 15:06:09 UTC +++ src/libUnicorn/TrackInfo.h @@ -33,6 +33,8 @@ #include diff --git a/audio/last.fm/files/patch-src__libUnicorn__UnicornCommon.cpp b/audio/last.fm/files/patch-src_libUnicorn_UnicornCommon.cpp similarity index 77% rename from audio/last.fm/files/patch-src__libUnicorn__UnicornCommon.cpp rename to audio/last.fm/files/patch-src_libUnicorn_UnicornCommon.cpp index eaa768aa63b3..fccf43d11f5a 100644 --- a/audio/last.fm/files/patch-src__libUnicorn__UnicornCommon.cpp +++ b/audio/last.fm/files/patch-src_libUnicorn_UnicornCommon.cpp @@ -1,4 +1,4 @@ ---- src/libUnicorn/UnicornCommon.cpp.orig +--- src/libUnicorn/UnicornCommon.cpp.orig 2016-07-26 15:06:09 UTC +++ src/libUnicorn/UnicornCommon.cpp @@ -29,6 +29,10 @@ #include diff --git a/audio/last.fm/files/patch-src_output_RtAudio_RtAudio.pro b/audio/last.fm/files/patch-src_output_RtAudio_RtAudio.pro new file mode 100644 index 000000000000..e4ee11fb0ae8 --- /dev/null +++ b/audio/last.fm/files/patch-src_output_RtAudio_RtAudio.pro @@ -0,0 +1,13 @@ +--- src/output/RtAudio/RtAudio.pro.orig 2008-04-09 11:46:29 UTC ++++ src/output/RtAudio/RtAudio.pro +@@ -8,10 +8,6 @@ include( ../../../definitions.pro.inc ) + HEADERS = rtaudioplayback.h + SOURCES = rtaudioplayback.cpp rtaudio/RtAudio.cpp + +-unix:!mac { +- LIBS += -lasound +-} +- + win32 { + LIBS += -lwinmm -Ldsound -ldsound -lole32 -lgdi32 -luser32 + INCLUDEPATH += dsound diff --git a/audio/last.fm/files/patch-src_output_RtAudio_rtaudio_RtAudio.cpp b/audio/last.fm/files/patch-src_output_RtAudio_rtaudio_RtAudio.cpp index 9c6dd5a04867..7ef7e9bfbaf7 100644 --- a/audio/last.fm/files/patch-src_output_RtAudio_rtaudio_RtAudio.cpp +++ b/audio/last.fm/files/patch-src_output_RtAudio_rtaudio_RtAudio.cpp @@ -1,4 +1,4 @@ ---- src/output/RtAudio/rtaudio/RtAudio.cpp.orig 2014-04-04 08:59:58.151014000 +0000 +--- src/output/RtAudio/rtaudio/RtAudio.cpp.orig 2016-07-26 15:06:09 UTC +++ src/output/RtAudio/rtaudio/RtAudio.cpp @@ -42,7 +42,7 @@ #include diff --git a/audio/last.fm/files/patch-src_rtaudioplayback-rtaudioplayback.cpp b/audio/last.fm/files/patch-src_output_RtAudio_rtaudioplayback.cpp similarity index 51% rename from audio/last.fm/files/patch-src_rtaudioplayback-rtaudioplayback.cpp rename to audio/last.fm/files/patch-src_output_RtAudio_rtaudioplayback.cpp index 3244cdb4caeb..793f3d4fdc07 100644 --- a/audio/last.fm/files/patch-src_rtaudioplayback-rtaudioplayback.cpp +++ b/audio/last.fm/files/patch-src_output_RtAudio_rtaudioplayback.cpp @@ -1,6 +1,6 @@ ---- src/output/RtAudio/rtaudioplayback.cpp.orig 2007-09-13 13:46:07.000000000 +0200 -+++ src/output/RtAudio/rtaudioplayback.cpp 2007-09-14 20:54:41.000000000 +0200 -@@ -157,7 +157,7 @@ +--- src/output/RtAudio/rtaudioplayback.cpp.orig 2016-07-26 15:06:09 UTC ++++ src/output/RtAudio/rtaudioplayback.cpp +@@ -158,7 +158,7 @@ RtAudioPlayback::soundSystems() #endif #ifdef Q_WS_X11 @@ -9,8 +9,8 @@ #endif #ifdef Q_WS_MAC -@@ -280,7 +280,7 @@ - int card = internalSoundCardID( The::settings().soundCard() ); +@@ -284,7 +284,7 @@ RtAudioPlayback::initAudio( + int card = internalSoundCardID( m_deviceNum ); #ifdef Q_WS_X11 - api = RtAudio::LINUX_ALSA; diff --git a/audio/last.fm/files/patch-src_output_alsa-playback_alsaaudio.cpp b/audio/last.fm/files/patch-src_output_alsa-playback_alsaaudio.cpp new file mode 100644 index 000000000000..b74adacfe79b --- /dev/null +++ b/audio/last.fm/files/patch-src_output_alsa-playback_alsaaudio.cpp @@ -0,0 +1,11 @@ +--- src/output/alsa-playback/alsaaudio.cpp.orig 2016-07-26 15:06:09 UTC ++++ src/output/alsa-playback/alsaaudio.cpp +@@ -798,8 +798,6 @@ int AlsaAudio::alsa_handle_error( int er + { + case -EPIPE: + return xrun_recover(); +- case -ESTRPIPE: +- return suspend_recover(); + } + + return err; diff --git a/audio/last.fm/files/patch-src_output_alsa-playback_xconvert.c b/audio/last.fm/files/patch-src_output_alsa-playback_xconvert.c new file mode 100644 index 000000000000..4435bb3f6bea --- /dev/null +++ b/audio/last.fm/files/patch-src_output_alsa-playback_xconvert.c @@ -0,0 +1,10 @@ +--- src/output/alsa-playback/xconvert.c.orig 2007-02-01 12:59:50 UTC ++++ src/output/alsa-playback/xconvert.c +@@ -57,6 +57,7 @@ + + #endif + ++#define uint size_t + + struct buffer { + void *buffer; diff --git a/audio/last.fm/files/patch-src__playerlistener.cpp b/audio/last.fm/files/patch-src_playerlistener.cpp similarity index 74% rename from audio/last.fm/files/patch-src__playerlistener.cpp rename to audio/last.fm/files/patch-src_playerlistener.cpp index b6a54e32e061..8d5d127cdd8d 100644 --- a/audio/last.fm/files/patch-src__playerlistener.cpp +++ b/audio/last.fm/files/patch-src_playerlistener.cpp @@ -1,4 +1,4 @@ ---- src/playerlistener.cpp.orig +--- src/playerlistener.cpp.orig 2016-07-26 15:06:09 UTC +++ src/playerlistener.cpp @@ -33,6 +33,10 @@ #include diff --git a/audio/last.fm/files/patch-src_rtaudioplayback-rtaudioplayback.pro b/audio/last.fm/files/patch-src_rtaudioplayback-rtaudioplayback.pro deleted file mode 100644 index 216db3b9fb50..000000000000 --- a/audio/last.fm/files/patch-src_rtaudioplayback-rtaudioplayback.pro +++ /dev/null @@ -1,13 +0,0 @@ ---- src/output/RtAudio/RtAudio.pro.orig Sat Jul 14 09:37:38 2007 -+++ src/output/RtAudio/RtAudio.pro Sat Jul 14 09:37:51 2007 -@@ -8,10 +8,6 @@ - HEADERS = rtaudioplayback.h - SOURCES = rtaudioplayback.cpp rtaudio/RtAudio.cpp - --unix:!mac { -- LIBS += -lasound --} -- - win32 { - LIBS += -lwinmm -Ldsound -ldsound -lole32 -lgdi32 -luser32 -lshfolder - INCLUDEPATH += dsound diff --git a/audio/last.fm/files/patch-src-updatewizard.h b/audio/last.fm/files/patch-src_updatewizard.h similarity index 60% rename from audio/last.fm/files/patch-src-updatewizard.h rename to audio/last.fm/files/patch-src_updatewizard.h index 91f6896c163c..c8a8868472df 100644 --- a/audio/last.fm/files/patch-src-updatewizard.h +++ b/audio/last.fm/files/patch-src_updatewizard.h @@ -1,6 +1,6 @@ ---- src/updatewizard.h.orig 2012-12-02 14:01:31.000000000 +0100 -+++ src/updatewizard.h 2012-12-02 14:01:42.000000000 +0100 -@@ -50,7 +50,7 @@ +--- src/updatewizard.h.orig 2016-07-26 15:06:09 UTC ++++ src/updatewizard.h +@@ -50,7 +50,7 @@ public: CAutoUpdater& updater, QWidget* parent = NULL); diff --git a/audio/last.fm/files/patch-src-wizardselectupdatespage.h b/audio/last.fm/files/patch-src_wizardselectupdatespage.h similarity index 63% rename from audio/last.fm/files/patch-src-wizardselectupdatespage.h rename to audio/last.fm/files/patch-src_wizardselectupdatespage.h index 630a18a8afb3..7a5aac7be511 100644 --- a/audio/last.fm/files/patch-src-wizardselectupdatespage.h +++ b/audio/last.fm/files/patch-src_wizardselectupdatespage.h @@ -1,6 +1,6 @@ ---- src/wizardselectupdatespage.h.orig 2012-12-02 13:59:46.000000000 +0100 -+++ src/wizardselectupdatespage.h 2012-12-02 14:00:17.000000000 +0100 -@@ -58,7 +58,7 @@ +--- src/wizardselectupdatespage.h.orig 2016-07-26 15:06:09 UTC ++++ src/wizardselectupdatespage.h +@@ -58,7 +58,7 @@ public: GetChecked( std::vector& vecChecked); diff --git a/audio/lastfm-desktop/files/patch-app_client_Services_RadioService_RadioService.cpp b/audio/lastfm-desktop/files/patch-app_client_Services_RadioService_RadioService.cpp index 1d2313f32af8..b6f16737d492 100644 --- a/audio/lastfm-desktop/files/patch-app_client_Services_RadioService_RadioService.cpp +++ b/audio/lastfm-desktop/files/patch-app_client_Services_RadioService_RadioService.cpp @@ -1,4 +1,4 @@ ---- app/client/Services/RadioService/RadioService.cpp.orig 2016-06-16 20:32:08 UTC +--- app/client/Services/RadioService/RadioService.cpp.orig 2013-09-03 12:19:10 UTC +++ app/client/Services/RadioService/RadioService.cpp @@ -307,7 +307,7 @@ RadioService::mute() void diff --git a/audio/libaacplus/files/patch-configure.ac b/audio/libaacplus/files/patch-configure.ac index c9eece272255..2ae5b88a4d76 100644 --- a/audio/libaacplus/files/patch-configure.ac +++ b/audio/libaacplus/files/patch-configure.ac @@ -1,6 +1,6 @@ ---- configure.ac.orig 2010-11-11 06:27:45.000000000 +0900 -+++ configure.ac 2012-01-26 17:47:39.000000000 +0900 -@@ -8,7 +8,7 @@ +--- configure.ac.orig 2010-11-10 21:27:45 UTC ++++ configure.ac +@@ -8,7 +8,7 @@ AM_INIT_AUTOMAKE AM_CONFIG_HEADER(config.h) AC_CONFIG_MACRO_DIR([m4]) # Checks for programs. @@ -9,7 +9,7 @@ AM_PROG_CC_C_O AC_PROG_CPP AC_PROG_INSTALL -@@ -16,10 +16,10 @@ +@@ -16,10 +16,10 @@ AC_PROG_LN_S AC_PROG_MAKE_SET AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL @@ -24,7 +24,7 @@ AC_PATH_PROG([PATCH],[patch]) if test x"$PATCH" = x -a ! -f "aacenc.c" ; then AC_MSG_ERROR([You need patch utility to prepare sources.]) -@@ -123,7 +123,7 @@ +@@ -123,7 +123,7 @@ AM_CONDITIONAL([HAVE_PKGCONFIG], [test " AACPLUS_VERSION="$VERSION" AACPLUS_CPPFLAGS="-I$aacplus_includedir $FFTW3_CPPFLAGS" diff --git a/audio/libaacplus/files/patch-include-aacplus.h b/audio/libaacplus/files/patch-include-aacplus.h deleted file mode 100644 index a2797f0e6453..000000000000 --- a/audio/libaacplus/files/patch-include-aacplus.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/aacplus.h.orig 2010-11-11 06:27:38.000000000 +0900 -+++ include/aacplus.h 2011-10-13 18:19:31.000000000 +0900 -@@ -12,7 +12,7 @@ - - typedef enum { - AACPLUS_INPUT_16BIT = 0, -- AACPLUS_INPUT_FLOAT, -+ AACPLUS_INPUT_FLOAT - } aacplusInFormat; - - diff --git a/audio/libaacplus/files/patch-include_aacplus.h b/audio/libaacplus/files/patch-include_aacplus.h new file mode 100644 index 000000000000..f4164577ee7a --- /dev/null +++ b/audio/libaacplus/files/patch-include_aacplus.h @@ -0,0 +1,11 @@ +--- include/aacplus.h.orig 2010-11-10 21:27:38 UTC ++++ include/aacplus.h +@@ -12,7 +12,7 @@ typedef void *aacplusEncHandle; + + typedef enum { + AACPLUS_INPUT_16BIT = 0, +- AACPLUS_INPUT_FLOAT, ++ AACPLUS_INPUT_FLOAT + } aacplusInFormat; + + diff --git a/audio/libaacplus/files/patch-src_Makefile.am b/audio/libaacplus/files/patch-src_Makefile.am index c02265ed96af..78786b6e24f5 100644 --- a/audio/libaacplus/files/patch-src_Makefile.am +++ b/audio/libaacplus/files/patch-src_Makefile.am @@ -1,6 +1,6 @@ ---- src/Makefile.am.orig 2010-11-11 06:27:41.000000000 +0900 -+++ src/Makefile.am 2014-05-22 07:32:03.000000000 +0900 -@@ -206,14 +206,14 @@ +--- src/Makefile.am.orig 2010-11-10 21:27:41 UTC ++++ src/Makefile.am +@@ -206,14 +206,14 @@ $(library_sources_used): $(MAKE) unpack_3gp_sources $(srcdir)/FloatFR_aacPlusenc: diff --git a/audio/libaiff/files/patch-Makefile.in b/audio/libaiff/files/patch-Makefile.in index e9b3bcc6fb53..862ef199e47c 100644 --- a/audio/libaiff/files/patch-Makefile.in +++ b/audio/libaiff/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2007-09-20 21:42:28.000000000 +0200 -+++ Makefile.in 2014-01-30 12:02:16.000000000 +0100 -@@ -6,7 +6,7 @@ +--- Makefile.in.orig 2007-09-20 19:42:28 UTC ++++ Makefile.in +@@ -6,7 +6,7 @@ AR = ar CFLAGS = @DEFS@ -I. -Ilibaiff -g -O2 -ansi -pedantic -Wall -Wfloat-equal -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wwrite-strings -Wsign-compare -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Wno-unreachable-code # for GCC4. comment for GCC3 @@ -9,7 +9,7 @@ prefix = @prefix@ -@@ -15,14 +15,14 @@ +@@ -15,14 +15,14 @@ objs = iff.o aifx.o lpcm.o g711.o \ all: libaiff.a diff --git a/audio/libaiff/files/patch-configure b/audio/libaiff/files/patch-configure index ba1189b711dc..94557fe52935 100644 --- a/audio/libaiff/files/patch-configure +++ b/audio/libaiff/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2014-01-30 12:04:02.000000000 +0100 -+++ configure 2014-01-30 12:04:11.000000000 +0100 -@@ -645,6 +645,7 @@ +--- configure.orig 2007-09-20 19:42:28 UTC ++++ configure +@@ -645,6 +645,7 @@ libdir localedir mandir DEFS diff --git a/audio/libao/files/patch-configure b/audio/libao/files/patch-configure index b0cdc3b03551..1e8c74b9d66f 100644 --- a/audio/libao/files/patch-configure +++ b/audio/libao/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2011-06-08 21:32:18.000000000 +0200 -+++ configure 2011-06-08 21:32:18.000000000 +0200 -@@ -11059,7 +11059,7 @@ if test -z "$GCC"; then +--- configure.orig 2014-01-27 17:10:36 UTC ++++ configure +@@ -12054,7 +12054,7 @@ if test -z "$GCC"; then *) PLUGIN_LDFLAGS="-export-dynamic -avoid-version" DEBUG="-g" @@ -9,7 +9,7 @@ PROFILE="-g -p" ;; esac else -@@ -11082,9 +11082,9 @@ else +@@ -12077,9 +12077,9 @@ else PROFILE="-g -pg -D__NO_MATH_INLINES -fsigned-char" ;; *) PLUGIN_LDFLAGS="-export-dynamic -avoid-version" @@ -22,7 +22,7 @@ esac fi CFLAGS="$CFLAGS $cflags_save -DAO_BUILDING_LIBAO" -@@ -12978,7 +12978,7 @@ if test "${ac_cv_lib_audio_AuOpenServer+ +@@ -13897,7 +13897,7 @@ if ${ac_cv_lib_audio_AuOpenServer+:} fal $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -31,7 +31,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -13041,7 +13041,7 @@ fi +@@ -13958,7 +13958,7 @@ fi if test "x$have_nas" = xyes; then NAS_CFLAGS="$X_CFLAGS" diff --git a/audio/libao/files/patch-doc_Makefile.in b/audio/libao/files/patch-doc_Makefile.in index 933cdbcd66c6..b72b6d3ca21a 100644 --- a/audio/libao/files/patch-doc_Makefile.in +++ b/audio/libao/files/patch-doc_Makefile.in @@ -1,6 +1,6 @@ ---- doc/Makefile.in.orig +--- doc/Makefile.in.orig 2014-01-27 23:57:41 UTC +++ doc/Makefile.in -@@ -161,7 +161,7 @@ +@@ -257,7 +257,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ diff --git a/audio/libao/files/patch-src_plugins_Makefile.in b/audio/libao/files/patch-src_plugins_Makefile.in index 46544fb0962f..bc8b2a9ec210 100644 --- a/audio/libao/files/patch-src_plugins_Makefile.in +++ b/audio/libao/files/patch-src_plugins_Makefile.in @@ -1,5 +1,5 @@ ---- src/plugins/Makefile.in.orig 2014-05-28 16:19:02.000000000 +0200 -+++ src/plugins/Makefile.in 2014-05-28 16:25:33.000000000 +0200 +--- src/plugins/Makefile.in.orig 2014-01-27 23:57:41 UTC ++++ src/plugins/Makefile.in @@ -388,7 +388,7 @@ $(am__recursive_targets): else \ local_target="$$target"; \ diff --git a/audio/libao/files/patch-src_plugins_pulse_Makefile.in b/audio/libao/files/patch-src_plugins_pulse_Makefile.in index 4bb6c61f7a9d..89fc6f162163 100644 --- a/audio/libao/files/patch-src_plugins_pulse_Makefile.in +++ b/audio/libao/files/patch-src_plugins_pulse_Makefile.in @@ -1,5 +1,5 @@ ---- src/plugins/pulse/Makefile.in.orig 2014-05-28 17:53:30.000000000 +0200 -+++ src/plugins/pulse/Makefile.in 2014-05-28 17:58:05.000000000 +0200 +--- src/plugins/pulse/Makefile.in.orig 2014-01-27 23:57:42 UTC ++++ src/plugins/pulse/Makefile.in @@ -348,7 +348,7 @@ AUTOMAKE_OPTIONS = foreign @HAVE_PULSE_TRUE@pulseltlibs = libpulse.la @HAVE_PULSE_FALSE@pulsesources = diff --git a/audio/libcanberra/files/patch-src_oss.c b/audio/libcanberra/files/patch-src_oss.c index 098792d93125..dd9ea89e4b0e 100644 --- a/audio/libcanberra/files/patch-src_oss.c +++ b/audio/libcanberra/files/patch-src_oss.c @@ -1,6 +1,6 @@ ---- src/oss.c.orig 2010-02-19 18:39:40.000000000 -0500 -+++ src/oss.c 2010-03-14 15:04:16.000000000 -0400 -@@ -262,7 +262,7 @@ static int open_oss(ca_context *c, struc +--- src/oss.c.orig 2011-02-23 01:51:00 UTC ++++ src/oss.c +@@ -259,7 +259,7 @@ static int open_oss(ca_context *c, struc val = AFMT_S16_NE; break; case CA_SAMPLE_S16RE: diff --git a/audio/libcdaudio/files/patch-CVE-2008-5030.2005-0706 b/audio/libcdaudio/files/patch-CVE-2008-5030.2005-0706 index 415b57ceb133..6ecdaa41091d 100644 --- a/audio/libcdaudio/files/patch-CVE-2008-5030.2005-0706 +++ b/audio/libcdaudio/files/patch-CVE-2008-5030.2005-0706 @@ -1,6 +1,6 @@ ---- src/cddb.c.orig 2004-09-09 05:26:39.000000000 +0400 -+++ src/cddb.c 2008-11-21 17:33:50.000000000 +0300 -@@ -1052,7 +1052,8 @@ +--- src/cddb.c.orig 2004-09-09 01:26:39 UTC ++++ src/cddb.c +@@ -1052,7 +1052,8 @@ cddb_query(int cd_desc, int sock, } query->query_matches = 0; @@ -10,7 +10,7 @@ slashed = 0; if(strchr(inbuffer, '/') != NULL && parse_disc_artist) { index = 0; -@@ -1601,7 +1602,7 @@ +@@ -1601,7 +1602,7 @@ cddb_read_disc_data(int cd_desc, struct return -1; } @@ -19,9 +19,9 @@ free(root_dir); free(file); return -1; ---- src/coverart.c.orig 2008-11-21 17:36:39.000000000 +0300 -+++ src/coverart.c 2008-11-21 17:39:41.000000000 +0300 -@@ -131,7 +131,9 @@ +--- src/coverart.c.orig 2003-02-12 17:56:55 UTC ++++ src/coverart.c +@@ -131,7 +131,9 @@ coverart_process_line(char *line, struct } } else if(strncmp(line, "Album", 5) == 0) { long n = strtol((char *)line + 5, NULL, 10); @@ -32,7 +32,7 @@ strtok(procbuffer, "/"); strncpy(query->query_list[n].list_artist, procbuffer, (strlen(procbuffer) < 64) ? (strlen(procbuffer) - 1) : 64); -@@ -143,7 +145,9 @@ +@@ -143,7 +145,9 @@ coverart_process_line(char *line, struct } } else if(strncmp(line, "Url", 3) == 0) { long n = strtol((char *)line + 3, NULL, 10); diff --git a/audio/libcddb/files/patch-include-cddb-cddb_log.h b/audio/libcddb/files/patch-include_cddb_cddb__log.h similarity index 51% rename from audio/libcddb/files/patch-include-cddb-cddb_log.h rename to audio/libcddb/files/patch-include_cddb_cddb__log.h index 0eea941fdb07..329431416fdb 100644 --- a/audio/libcddb/files/patch-include-cddb-cddb_log.h +++ b/audio/libcddb/files/patch-include_cddb_cddb__log.h @@ -1,5 +1,5 @@ ---- include/cddb/cddb_log.h.orig 2005-03-11 22:29:29.000000000 +0100 -+++ include/cddb/cddb_log.h 2014-03-20 16:00:15.000000000 +0100 +--- include/cddb/cddb_log.h.orig 2005-03-11 21:29:29 UTC ++++ include/cddb/cddb_log.h @@ -19,7 +19,7 @@ Boston, MA 02111-1307, USA. */ diff --git a/audio/libcddb/files/patch-include-cddb-cddb_log_ni.h b/audio/libcddb/files/patch-include_cddb_cddb__log__ni.h similarity index 51% rename from audio/libcddb/files/patch-include-cddb-cddb_log_ni.h rename to audio/libcddb/files/patch-include_cddb_cddb__log__ni.h index f18bd7191b81..63a165f259c7 100644 --- a/audio/libcddb/files/patch-include-cddb-cddb_log_ni.h +++ b/audio/libcddb/files/patch-include_cddb_cddb__log__ni.h @@ -1,5 +1,5 @@ ---- include/cddb/cddb_log_ni.h.orig 2005-03-11 22:29:29.000000000 +0100 -+++ include/cddb/cddb_log_ni.h 2014-03-20 16:00:24.000000000 +0100 +--- include/cddb/cddb_log_ni.h.orig 2005-03-11 21:29:29 UTC ++++ include/cddb/cddb_log_ni.h @@ -19,7 +19,7 @@ Boston, MA 02111-1307, USA. */ diff --git a/audio/libconvolve/files/patch-Makefile b/audio/libconvolve/files/patch-Makefile index 1ab141eb90c3..22c193b3f084 100644 --- a/audio/libconvolve/files/patch-Makefile +++ b/audio/libconvolve/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Mon Apr 2 09:20:41 2007 -+++ Makefile Mon Apr 2 09:20:55 2007 +--- Makefile.orig 2005-11-29 00:18:03 UTC ++++ Makefile @@ -1,19 +1,18 @@ PREFIX=/usr/local @@ -23,7 +23,7 @@ ST_TARGET = libconvolve.a -@@ -53,5 +52,5 @@ +@@ -53,5 +52,5 @@ install: $(TARGET) cp $(TARGET) $(PREFIX)/lib/ cp $(ST_TARGET) $(PREFIX)/lib/ cp convolve.h $(PREFIX)/include/ diff --git a/audio/libconvolve/files/patch-convolution_init.c b/audio/libconvolve/files/patch-convolution__init.c similarity index 88% rename from audio/libconvolve/files/patch-convolution_init.c rename to audio/libconvolve/files/patch-convolution__init.c index 6c5bebc4eb34..7fca9b6f5c4d 100644 --- a/audio/libconvolve/files/patch-convolution_init.c +++ b/audio/libconvolve/files/patch-convolution__init.c @@ -1,5 +1,5 @@ ---- convolution_init.c.orig Mon Nov 28 00:24:57 2005 -+++ convolution_init.c Mon Apr 2 09:26:43 2007 +--- convolution_init.c.orig 2005-11-27 23:24:57 UTC ++++ convolution_init.c @@ -17,8 +17,19 @@ */ @@ -21,7 +21,7 @@ int convolution_init (convolution_t *conv, int number_of_responses, -@@ -47,12 +58,12 @@ +@@ -47,12 +58,12 @@ int convolution_init (convolution_t *con // allocate FFT buffers // as r2c stores only N/2+1 results, we don't need the padded size for this // conv->fft_complex = (fftwf_complex*)malloc (sizeof(fftwf_complex) * (conv->chunk_length + 1)); @@ -36,7 +36,7 @@ // create fftw plans conv->fft_plan_forward = fftwf_plan_dft_r2c_1d (2 * conv->chunk_length, -@@ -100,7 +111,7 @@ +@@ -100,7 +111,7 @@ int convolution_init (convolution_t *con * (conv->chunk_length + 1) * conv->fft_responses[index]->number_of_chunks); */ @@ -45,7 +45,7 @@ 16, sizeof(fftwf_complex) * (conv->chunk_length + 1) -@@ -169,7 +180,7 @@ +@@ -169,7 +180,7 @@ int convolution_init (convolution_t *con // need to divide (integer divide) the index by number_of_responses to get // a valid index into the list of responses. @@ -54,7 +54,7 @@ sizeof(fftwf_complex) * conv->fft_responses[index/conv->number_of_response_channels]->number_of_chunks * (conv->chunk_length + 1)); -@@ -189,7 +200,7 @@ +@@ -189,7 +200,7 @@ int convolution_init (convolution_t *con = (fftwf_complex*)malloc (sizeof(fftwf_complex) * conv->fft_responses[index]->number_of_chunks * (conv->chunk_length + 1)); */ @@ -63,7 +63,7 @@ sizeof(fftwf_complex) * conv->fft_responses[index]->number_of_chunks * (conv->chunk_length + 1)); -@@ -222,7 +233,7 @@ +@@ -222,7 +233,7 @@ int convolution_init (convolution_t *con for (index = 0; index < conv->number_of_response_channels; ++index) { // conv->overlap_buffers[index] = (float*)malloc (sizeof(float) * conv->chunk_length); diff --git a/audio/libconvolve/files/patch-convolution_process.c b/audio/libconvolve/files/patch-convolution__process.c similarity index 52% rename from audio/libconvolve/files/patch-convolution_process.c rename to audio/libconvolve/files/patch-convolution__process.c index a5582fb2a21e..da28f547847b 100644 --- a/audio/libconvolve/files/patch-convolution_process.c +++ b/audio/libconvolve/files/patch-convolution__process.c @@ -1,5 +1,5 @@ ---- convolution_process.c.orig Mon Apr 2 09:22:07 2007 -+++ convolution_process.c Mon Apr 2 09:22:15 2007 +--- convolution_process.c.orig 2005-11-27 23:23:16 UTC ++++ convolution_process.c @@ -23,7 +23,7 @@ #include #endif diff --git a/audio/libechonest/files/patch-CMakeLists.txt b/audio/libechonest/files/patch-CMakeLists.txt index 178257c835fe..f453f6c5d956 100644 --- a/audio/libechonest/files/patch-CMakeLists.txt +++ b/audio/libechonest/files/patch-CMakeLists.txt @@ -1,7 +1,7 @@ ---- CMakeLists.txt.orig 2014-09-13 05:55:46.000000000 +0200 -+++ CMakeLists.txt 2014-11-29 22:23:13.000000000 +0100 -@@ -59,7 +59,7 @@ - set( ECHONEST_LIB_PATCH_VERSION "0" ) +--- CMakeLists.txt.orig 2015-02-07 19:56:50 UTC ++++ CMakeLists.txt +@@ -59,7 +59,7 @@ set( ECHONEST_LIB_MINOR_VERSION "3" ) + set( ECHONEST_LIB_PATCH_VERSION "1" ) set( ECHONEST_LIB_VERSION "${ECHONEST_LIB_MAJOR_VERSION}.${ECHONEST_LIB_MINOR_VERSION}.${ECHONEST_LIB_PATCH_VERSION}" ) -set( ECHONEST_LIB_VERSION_SONAME "${ECHONEST_LIB_MAJOR_VERSION}.${ECHONEST_LIB_MINOR_VERSION}") @@ -9,7 +9,7 @@ if (CMAKE_COMPILER_IS_GNUCXX) ADD_DEFINITIONS( -Wall -Wundef -Wcast-align -Wchar-subscripts -Wpointer-arith -@@ -110,7 +110,7 @@ +@@ -110,7 +110,7 @@ IF (NOT WIN32) ${CMAKE_CURRENT_BINARY_DIR}/libechonest${ECHONEST_LIB_VERSION_SUFFIX}.pc @ONLY) INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/libechonest${ECHONEST_LIB_VERSION_SUFFIX}.pc diff --git a/audio/libid3tag/files/patch-id3tag.pc.in b/audio/libid3tag/files/patch-id3tag.pc.in index 282ed2507a0f..f89fa4b7dfd0 100644 --- a/audio/libid3tag/files/patch-id3tag.pc.in +++ b/audio/libid3tag/files/patch-id3tag.pc.in @@ -1,5 +1,5 @@ ---- id3tag.pc.in.orig 1970-01-01 09:00:00.000000000 +0900 -+++ id3tag.pc.in 2003-11-11 08:42:38.000000000 +0900 +--- id3tag.pc.in.orig 2016-07-26 15:08:54 UTC ++++ id3tag.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ diff --git a/audio/liblo/files/patch-src-lo_types_internal.h b/audio/liblo/files/patch-src_lo__types__internal.h similarity index 61% rename from audio/liblo/files/patch-src-lo_types_internal.h rename to audio/liblo/files/patch-src_lo__types__internal.h index 8ad55955f6f6..7ddcfa966359 100644 --- a/audio/liblo/files/patch-src-lo_types_internal.h +++ b/audio/liblo/files/patch-src_lo__types__internal.h @@ -1,5 +1,5 @@ ---- src/lo_types_internal.h.orig 2013-05-22 18:34:31.000000000 +0200 -+++ src/lo_types_internal.h 2013-06-24 01:54:53.000000000 +0200 +--- src/lo_types_internal.h.orig 2013-07-25 10:14:32 UTC ++++ src/lo_types_internal.h @@ -20,6 +20,7 @@ #else #define closesocket close @@ -8,7 +8,7 @@ #include #endif -@@ -33,6 +34,7 @@ +@@ -33,6 +34,7 @@ typedef __int32 int32_t; #ifdef ENABLE_THREADS #include diff --git a/audio/liblo/files/patch-src-messages.c b/audio/liblo/files/patch-src_message.c similarity index 80% rename from audio/liblo/files/patch-src-messages.c rename to audio/liblo/files/patch-src_message.c index 0eb8820b8e97..1d72a7025726 100644 --- a/audio/liblo/files/patch-src-messages.c +++ b/audio/liblo/files/patch-src_message.c @@ -1,5 +1,5 @@ ---- src/message.c.orig 2014-01-20 12:49:42.000000000 +0100 -+++ src/message.c 2014-12-03 23:02:28.000000000 +0100 +--- src/message.c.orig 2014-01-20 11:49:42 UTC ++++ src/message.c @@ -996,8 +996,8 @@ void lo_message_pp(lo_message m) putchar('\n'); if (d != end) { diff --git a/audio/libmad/files/patch-configure b/audio/libmad/files/patch-configure index 998ffe2be26e..f4800b97ef3d 100644 --- a/audio/libmad/files/patch-configure +++ b/audio/libmad/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2014-02-11 23:45:49.000000000 +0100 -+++ configure 2014-02-11 23:50:50.000000000 +0100 -@@ -19096,24 +19096,30 @@ +--- configure.orig 2004-02-05 09:34:07 UTC ++++ configure +@@ -19096,24 +19096,30 @@ then esac fi diff --git a/audio/libmp3-archive-perl/files/patch-Makefile.PL b/audio/libmp3-archive-perl/files/patch-Makefile.PL index 4c6f7e243590..65c5009e167d 100644 --- a/audio/libmp3-archive-perl/files/patch-Makefile.PL +++ b/audio/libmp3-archive-perl/files/patch-Makefile.PL @@ -1,4 +1,4 @@ ---- Makefile.PL.orig 2015-04-20 11:29:37 UTC +--- Makefile.PL.orig 2003-11-16 07:09:00 UTC +++ Makefile.PL @@ -77,7 +77,7 @@ sub MY::install { my $self = shift; diff --git a/audio/libmp3splt/files/patch-configure b/audio/libmp3splt/files/patch-configure index 29a81eceafe0..66278da3d019 100644 --- a/audio/libmp3splt/files/patch-configure +++ b/audio/libmp3splt/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2013-07-25 15:33:15.000000000 +0000 +--- configure.orig 2014-11-09 16:48:20 UTC +++ configure -@@ -15422,7 +15422,7 @@ elif test "x$prefix" != "xNONE"; then +@@ -15614,7 +15614,7 @@ elif test "x$prefix" != "xNONE"; then ID3_LIBS="-L$prefix/lib" fi diff --git a/audio/libmp3splt/files/patch-src-oformat_parser.c b/audio/libmp3splt/files/patch-src_oformat__parser.c similarity index 59% rename from audio/libmp3splt/files/patch-src-oformat_parser.c rename to audio/libmp3splt/files/patch-src_oformat__parser.c index 6006dee820d2..b4aad1e29ff9 100644 --- a/audio/libmp3splt/files/patch-src-oformat_parser.c +++ b/audio/libmp3splt/files/patch-src_oformat__parser.c @@ -1,6 +1,6 @@ ---- src/oformat_parser.c.orig 2011-11-11 22:14:03.000000000 +0100 -+++ src/oformat_parser.c 2012-04-11 09:45:52.000000000 +0200 -@@ -301,7 +301,7 @@ +--- src/oformat_parser.c.orig 2014-10-02 22:46:20 UTC ++++ src/oformat_parser.c +@@ -336,7 +336,7 @@ char splt_of_get_number_of_digits_from_t } long minutes = total_time / 100 / 60; diff --git a/audio/libmusicbrainz5/files/patch-src_CMakeLists.txt b/audio/libmusicbrainz5/files/patch-src_CMakeLists.txt index fb2d918d5151..4e0f96e395e3 100644 --- a/audio/libmusicbrainz5/files/patch-src_CMakeLists.txt +++ b/audio/libmusicbrainz5/files/patch-src_CMakeLists.txt @@ -1,4 +1,4 @@ ---- src/CMakeLists.txt.orig 2015-06-16 13:01:35 UTC +--- src/CMakeLists.txt.orig 2014-11-13 13:12:24 UTC +++ src/CMakeLists.txt @@ -5,6 +5,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/../include diff --git a/audio/libnoise/files/patch-src_Makefile b/audio/libnoise/files/patch-src_Makefile index 5ab2fdcd73e3..7f2498167bac 100644 --- a/audio/libnoise/files/patch-src_Makefile +++ b/audio/libnoise/files/patch-src_Makefile @@ -1,6 +1,6 @@ ---- src/Makefile.orig 2014-09-15 11:57:34 UTC +--- src/Makefile.orig 2016-07-26 15:10:03 UTC +++ src/Makefile -@@ -11,7 +11,7 @@ +@@ -11,7 +11,7 @@ OBJECTS=$(SOURCES:.cpp=.o) .PHONY: all clean cleandeps cleanobjs cleanlib libnoise libnoise.so libnoise.so.0 # hooks for future makefiles being able to make multiple SOs, or older SOs @@ -9,7 +9,7 @@ libnoise.so: libnoise.so.0 libnoise.so.0: libnoise.so.0.3 -@@ -21,8 +21,8 @@ +@@ -21,8 +21,8 @@ libnoise.so.0.3: $(OBJECTS) libnoise.a: $(OBJECTS) $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $(OBJECTS) diff --git a/audio/libofa/files/patch-configure b/audio/libofa/files/patch-configure index 7f59fd800ddf..8b6506185ed6 100644 --- a/audio/libofa/files/patch-configure +++ b/audio/libofa/files/patch-configure @@ -1,6 +1,6 @@ ---- ./configure.orig 2011-03-18 11:01:22.000000000 -0400 -+++ ./configure 2011-03-18 11:01:22.000000000 -0400 -@@ -20315,13 +20315,6 @@ +--- configure.orig 2016-07-26 15:10:24 UTC ++++ configure +@@ -20315,13 +20315,6 @@ _ACEOF diff --git a/audio/libofa/files/patch-examples__example.cpp b/audio/libofa/files/patch-examples_example.cpp similarity index 59% rename from audio/libofa/files/patch-examples__example.cpp rename to audio/libofa/files/patch-examples_example.cpp index 4a0eb68b177c..e7ffccaaafda 100644 --- a/audio/libofa/files/patch-examples__example.cpp +++ b/audio/libofa/files/patch-examples_example.cpp @@ -1,5 +1,5 @@ ---- ./examples/example.cpp.orig 2011-03-18 11:01:22.000000000 -0400 -+++ ./examples/example.cpp 2011-03-18 11:01:22.000000000 -0400 +--- examples/example.cpp.orig 2016-07-26 15:10:24 UTC ++++ examples/example.cpp @@ -7,6 +7,8 @@ -------------------------------------------------------------------*/ diff --git a/audio/libofa/files/patch-examples__protocol.cpp b/audio/libofa/files/patch-examples_protocol.cpp similarity index 69% rename from audio/libofa/files/patch-examples__protocol.cpp rename to audio/libofa/files/patch-examples_protocol.cpp index a8716757c050..88359a716274 100644 --- a/audio/libofa/files/patch-examples__protocol.cpp +++ b/audio/libofa/files/patch-examples_protocol.cpp @@ -1,5 +1,5 @@ ---- ./examples/protocol.cpp.orig 2011-03-18 11:01:22.000000000 -0400 -+++ ./examples/protocol.cpp 2011-03-18 11:01:22.000000000 -0400 +--- examples/protocol.cpp.orig 2016-07-26 15:10:24 UTC ++++ examples/protocol.cpp @@ -8,11 +8,11 @@ -------------------------------------------------------------------*/ #include diff --git a/audio/libofa/files/patch-examples_uselame.cpp b/audio/libofa/files/patch-examples_uselame.cpp index 310a8ae75075..c23a5ef61237 100644 --- a/audio/libofa/files/patch-examples_uselame.cpp +++ b/audio/libofa/files/patch-examples_uselame.cpp @@ -1,5 +1,5 @@ ---- examples/uselame.cpp.orig 2013-09-12 09:10:31.000000000 +0000 -+++ examples/uselame.cpp 2013-09-12 09:10:42.000000000 +0000 +--- examples/uselame.cpp.orig 2016-07-26 15:10:24 UTC ++++ examples/uselame.cpp @@ -12,6 +12,7 @@ #else #include diff --git a/audio/libofa/files/patch-examples_wavefile.cpp b/audio/libofa/files/patch-examples_wavefile.cpp index 41f319082188..0dedb8067616 100644 --- a/audio/libofa/files/patch-examples_wavefile.cpp +++ b/audio/libofa/files/patch-examples_wavefile.cpp @@ -1,5 +1,5 @@ ---- examples/wavefile.cpp.orig 2013-09-12 08:58:25.000000000 +0000 -+++ examples/wavefile.cpp 2013-09-12 08:58:31.000000000 +0000 +--- examples/wavefile.cpp.orig 2016-07-26 15:10:24 UTC ++++ examples/wavefile.cpp @@ -11,6 +11,8 @@ #include "io.h" #endif diff --git a/audio/libofa/files/patch-lib__JAMA__tnt_math_utils.h b/audio/libofa/files/patch-lib_JAMA_tnt__math__utils.h similarity index 71% rename from audio/libofa/files/patch-lib__JAMA__tnt_math_utils.h rename to audio/libofa/files/patch-lib_JAMA_tnt__math__utils.h index 10872bc74f97..db0d6997b6de 100644 --- a/audio/libofa/files/patch-lib__JAMA__tnt_math_utils.h +++ b/audio/libofa/files/patch-lib_JAMA_tnt__math__utils.h @@ -1,6 +1,6 @@ ---- ./lib/JAMA/tnt_math_utils.h.orig 2011-03-16 10:47:10.000000000 -0400 -+++ ./lib/JAMA/tnt_math_utils.h 2011-03-16 10:51:40.000000000 -0400 -@@ -20,6 +20,14 @@ +--- lib/JAMA/tnt_math_utils.h.orig 2016-07-26 15:10:24 UTC ++++ lib/JAMA/tnt_math_utils.h +@@ -20,6 +20,14 @@ inline const _Tp& max(const _Tp& __a, co namespace TNT { /** @@ -15,7 +15,7 @@ @returns hypotenuse of real (non-complex) scalars a and b by avoiding underflow/overflow using (a * sqrt( 1 + (b/a) * (b/a))), rather than -@@ -56,15 +64,6 @@ +@@ -56,15 +64,6 @@ Scalar max(const Scalar &a, const Scalar } */ diff --git a/audio/libofa/files/patch-lib__signal_op.cpp b/audio/libofa/files/patch-lib_signal__op.cpp similarity index 53% rename from audio/libofa/files/patch-lib__signal_op.cpp rename to audio/libofa/files/patch-lib_signal__op.cpp index 54690666c4e6..dc6f53d552e3 100644 --- a/audio/libofa/files/patch-lib__signal_op.cpp +++ b/audio/libofa/files/patch-lib_signal__op.cpp @@ -1,5 +1,5 @@ ---- ./lib/signal_op.cpp.orig 2011-03-18 11:01:22.000000000 -0400 -+++ ./lib/signal_op.cpp 2011-03-18 11:01:39.000000000 -0400 +--- lib/signal_op.cpp.orig 2016-07-26 15:10:24 UTC ++++ lib/signal_op.cpp @@ -13,6 +13,7 @@ diff --git a/audio/libogg/files/patch-configure b/audio/libogg/files/patch-configure index 277d0dfd2016..231bebf5123c 100644 --- a/audio/libogg/files/patch-configure +++ b/audio/libogg/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon Nov 17 17:34:08 2003 -+++ configure Mon Nov 24 18:26:28 2003 -@@ -7818,7 +7819,7 @@ +--- configure.orig 2014-05-27 19:52:46 UTC ++++ configure +@@ -11719,7 +11719,7 @@ if test -z "$GCC"; then ;; *) DEBUG="-g" @@ -9,7 +9,7 @@ PROFILE="-g -p" ;; esac -@@ -7841,8 +7842,8 @@ +@@ -11742,8 +11742,8 @@ else ;; *) DEBUG="-g -Wall -fsigned-char" diff --git a/audio/libsamplerate/files/patch-src_samplerate.h b/audio/libsamplerate/files/patch-src_samplerate.h index 171ecfee62bd..e316af6767e2 100644 --- a/audio/libsamplerate/files/patch-src_samplerate.h +++ b/audio/libsamplerate/files/patch-src_samplerate.h @@ -1,6 +1,6 @@ ---- src/samplerate.h.orig 2013-11-23 23:36:11.000000000 +0100 -+++ src/samplerate.h 2013-11-23 23:36:25.000000000 +0100 -@@ -174,7 +174,7 @@ +--- src/samplerate.h.orig 2011-01-19 10:39:21 UTC ++++ src/samplerate.h +@@ -174,7 +174,7 @@ enum SRC_SINC_MEDIUM_QUALITY = 1, SRC_SINC_FASTEST = 2, SRC_ZERO_ORDER_HOLD = 3, diff --git a/audio/libshairport/files/patch-configure.in b/audio/libshairport/files/patch-configure.in index 1a51ff291521..3ac6b33f836b 100644 --- a/audio/libshairport/files/patch-configure.in +++ b/audio/libshairport/files/patch-configure.in @@ -1,6 +1,6 @@ ---- configure.in.orig 2011-09-23 22:56:46.000000000 +0200 -+++ configure.in 2012-10-09 12:09:33.000000000 +0200 -@@ -11,8 +11,9 @@ +--- configure.in.orig 2011-09-23 20:56:46 UTC ++++ configure.in +@@ -11,8 +11,9 @@ AC_PROG_LIBTOOL # Checks for libraries. #AC_CHECK_LIB([c], [main]) @@ -11,7 +11,7 @@ AC_CHECK_LIB([pthread], [main],, AC_MSG_ERROR($missing_library)) OUTPUT_FILES="Makefile" -@@ -21,4 +22,4 @@ +@@ -21,4 +22,4 @@ LIBDIR=$PREFIX AC_CONFIG_FILES([${OUTPUT_FILES}]) AC_OUTPUT(Makefile src/Makefile) diff --git a/audio/libshairport/files/patch-src-Makefile.am b/audio/libshairport/files/patch-src_Makefile.am similarity index 73% rename from audio/libshairport/files/patch-src-Makefile.am rename to audio/libshairport/files/patch-src_Makefile.am index 4f1d46973aee..2273cf45b9ce 100644 --- a/audio/libshairport/files/patch-src-Makefile.am +++ b/audio/libshairport/files/patch-src_Makefile.am @@ -1,5 +1,5 @@ ---- src/Makefile.am.orig 2011-09-23 23:14:39.000000000 +0200 -+++ src/Makefile.am 2012-10-09 12:09:33.000000000 +0200 +--- src/Makefile.am.orig 2011-09-23 21:14:39 UTC ++++ src/Makefile.am @@ -1,7 +1,7 @@ lib_LTLIBRARIES=libshairport.la diff --git a/audio/libshairport/files/patch-src-alac.c b/audio/libshairport/files/patch-src_alac.c similarity index 82% rename from audio/libshairport/files/patch-src-alac.c rename to audio/libshairport/files/patch-src_alac.c index 8face193c68f..477b6f2f3a3b 100644 --- a/audio/libshairport/files/patch-src-alac.c +++ b/audio/libshairport/files/patch-src_alac.c @@ -1,6 +1,6 @@ ---- src/alac.c.orig 2011-08-21 00:06:21.000000000 +0200 -+++ src/alac.c 2012-10-09 12:09:33.000000000 +0200 -@@ -804,7 +804,7 @@ +--- src/alac.c.orig 2011-08-20 22:06:21 UTC ++++ src/alac.c +@@ -804,7 +804,7 @@ void decode_frame(alac_file *alac, } else { @@ -9,7 +9,7 @@ /* i think the only other prediction type (or perhaps this is just a * boolean?) runs adaptive fir twice.. like: * predictor_decompress_fir_adapt(predictor_error, tempout, ...) -@@ -885,7 +885,7 @@ +@@ -885,7 +885,7 @@ void decode_frame(alac_file *alac, } case 20: case 32: @@ -18,7 +18,7 @@ break; default: break; -@@ -1004,7 +1004,7 @@ +@@ -1004,7 +1004,7 @@ void decode_frame(alac_file *alac, } else { /* see mono case */ @@ -27,7 +27,7 @@ } /* channel 2 */ -@@ -1029,7 +1029,7 @@ +@@ -1029,7 +1029,7 @@ void decode_frame(alac_file *alac, } else { @@ -36,7 +36,7 @@ } } else -@@ -1106,7 +1106,7 @@ +@@ -1106,7 +1106,7 @@ void decode_frame(alac_file *alac, } case 20: case 32: diff --git a/audio/libshairport/files/patch-src-ao.h b/audio/libshairport/files/patch-src_ao.h similarity index 98% rename from audio/libshairport/files/patch-src-ao.h rename to audio/libshairport/files/patch-src_ao.h index 2e1ee3f78bcd..fdb8a165dafd 100644 --- a/audio/libshairport/files/patch-src-ao.h +++ b/audio/libshairport/files/patch-src_ao.h @@ -1,5 +1,5 @@ ---- src/ao.h.orig 2012-10-09 12:33:01.000000000 +0200 -+++ src/ao.h 2012-10-09 12:09:33.000000000 +0200 +--- src/ao.h.orig 2016-07-26 15:10:45 UTC ++++ src/ao.h @@ -0,0 +1,158 @@ +/* + * diff --git a/audio/libshairport/files/patch-src-hairtunes.c b/audio/libshairport/files/patch-src_hairtunes.c similarity index 85% rename from audio/libshairport/files/patch-src-hairtunes.c rename to audio/libshairport/files/patch-src_hairtunes.c index b00621d1ea45..c79446151e87 100644 --- a/audio/libshairport/files/patch-src-hairtunes.c +++ b/audio/libshairport/files/patch-src_hairtunes.c @@ -1,5 +1,5 @@ ---- src/hairtunes.c.orig 2011-09-23 21:55:48.000000000 +0200 -+++ src/hairtunes.c 2012-10-09 12:09:33.000000000 +0200 +--- src/hairtunes.c.orig 2011-09-23 19:55:48 UTC ++++ src/hairtunes.c @@ -25,7 +25,7 @@ */ @@ -18,7 +18,7 @@ #endif #ifdef FANCY_RESAMPLING -@@ -89,7 +89,6 @@ +@@ -89,7 +89,6 @@ int pipe_handle = -1; // maximal resampling shift - conservative #define OUTFRAME_BYTES (4*(frame_size+3)) @@ -26,7 +26,7 @@ alac_file *decoder_info; #ifdef FANCY_RESAMPLING -@@ -122,8 +121,8 @@ +@@ -122,8 +121,8 @@ pthread_mutex_t ab_mutex; pthread_cond_t ab_buffer_ready; static void die(char *why) { @@ -37,7 +37,7 @@ } static int hex2bin(unsigned char *buf, char *hex) { -@@ -246,13 +245,13 @@ +@@ -246,13 +245,13 @@ int hairtunes_init(char *pAeskey, char * continue; } if (!strcmp(line, "exit\n")) { @@ -53,7 +53,7 @@ fflush(stderr); #endif -@@ -263,18 +262,28 @@ +@@ -263,18 +262,28 @@ void hairtunes_setvolume(float f) { assert(f<=0); if (debug) @@ -84,7 +84,7 @@ } #ifdef HAIRTUNES_STANDALONE -@@ -424,7 +433,7 @@ +@@ -424,7 +433,7 @@ static void buffer_put_packet(seq_t seqn } else if (seq_order(ab_read, seqno)) { // late but not yet played abuf = audio_buffer + BUFIDX(seqno); } else { // too late. @@ -93,7 +93,7 @@ } buf_fill = ab_write - ab_read; pthread_mutex_unlock(&ab_mutex); -@@ -521,7 +530,7 @@ +@@ -521,7 +530,7 @@ static void rtp_request_resend(seq_t fir if (seq_order(last, first)) return; @@ -102,7 +102,7 @@ char req[8]; // *not* a standard RTCP NACK req[0] = 0x80; -@@ -605,8 +614,8 @@ +@@ -605,8 +614,8 @@ static int init_rtp(void) { port += 3; } @@ -113,7 +113,7 @@ rtp_sockets[0] = sock; rtp_sockets[1] = csock; -@@ -709,7 +718,7 @@ +@@ -709,7 +718,7 @@ void bf_est_update(short fill) { bf_est_drift = biquad_filt(&bf_drift_lpf, CONTROL_B*(bf_est_err*CONTROL_A + err_deriv) + bf_est_drift); if (debug) @@ -122,7 +122,7 @@ bf_playback_rate = 1.0 + CONTROL_A*bf_est_err + bf_est_drift; bf_last_err = bf_est_err; -@@ -725,7 +734,7 @@ +@@ -725,7 +734,7 @@ short *buffer_get_frame(void) { buf_fill = ab_write - ab_read; if (buf_fill < 1 || !ab_synced || ab_buffering) { // init or underrun. stop and wait if (ab_synced) @@ -131,7 +131,7 @@ ab_buffering = 1; pthread_cond_wait(&ab_buffer_ready, &ab_mutex); -@@ -737,7 +746,7 @@ +@@ -737,7 +746,7 @@ short *buffer_get_frame(void) { return 0; } if (buf_fill >= BUFFER_FRAMES) { // overrunning! uh-oh. restart at a sane distance @@ -140,7 +140,7 @@ ab_read = ab_write - START_FILL; } read = ab_read; -@@ -749,7 +758,7 @@ +@@ -749,7 +758,7 @@ short *buffer_get_frame(void) { volatile abuf_t *curframe = audio_buffer + BUFIDX(read); if (!curframe->ready) { @@ -149,7 +149,7 @@ memset(curframe->data, 0, FRAME_BYTES); } curframe->ready = 0; -@@ -776,13 +785,13 @@ +@@ -776,13 +785,13 @@ int stuff_buffer(double playback_rate, s if (stuff) { if (stuff==1) { if (debug) @@ -165,7 +165,7 @@ inptr++; inptr++; } -@@ -849,6 +858,11 @@ +@@ -849,6 +858,11 @@ void *audio_thread_func(void *arg) { inbuf = buffer_get_frame(); } while (!inbuf && audio_running); @@ -177,7 +177,7 @@ #ifdef FANCY_RESAMPLING if (fancy_resampling) { int i; -@@ -881,7 +895,7 @@ +@@ -881,7 +895,7 @@ void *audio_thread_func(void *arg) { } #ifdef HAS_AO } else { @@ -186,7 +186,7 @@ #endif } } -@@ -906,7 +920,7 @@ +@@ -906,7 +920,7 @@ void init_pipe(char* pipe) { ao_device *dev; void* init_ao() { @@ -195,7 +195,7 @@ int driver; #ifndef XBMC -@@ -921,7 +935,7 @@ +@@ -921,7 +935,7 @@ void* init_ao() { #endif { // otherwise choose the default @@ -204,7 +204,7 @@ } ao_sample_format fmt; -@@ -944,9 +958,9 @@ +@@ -944,9 +958,9 @@ void* init_ao() { } #endif @@ -216,7 +216,7 @@ if (dev == NULL) { die("Could not open ao device"); } -@@ -985,12 +999,13 @@ +@@ -985,12 +999,13 @@ void clean_output(void) audio_running = 0; pthread_join(audio_thread, NULL); #ifdef HAS_AO diff --git a/audio/libshairport/files/patch-src-hairtunes.h b/audio/libshairport/files/patch-src_hairtunes.h similarity index 80% rename from audio/libshairport/files/patch-src-hairtunes.h rename to audio/libshairport/files/patch-src_hairtunes.h index 0dfba09d6ff6..13ccb776b5aa 100644 --- a/audio/libshairport/files/patch-src-hairtunes.h +++ b/audio/libshairport/files/patch-src_hairtunes.h @@ -1,5 +1,5 @@ ---- src/hairtunes.h.orig 2011-08-21 00:06:21.000000000 +0200 -+++ src/hairtunes.h 2012-10-09 12:09:33.000000000 +0200 +--- src/hairtunes.h.orig 2011-08-20 22:06:21 UTC ++++ src/hairtunes.h @@ -4,6 +4,8 @@ int hairtunes_init(char *pAeskey, char *pAesiv, char *pFmtpstr, int pCtrlPort, int pTimingPort, int pDataPort, char *pRtpHost, char*pPipeName, char *pLibaoDriver, char *pLibaoDeviceName, char *pLibaoDeviceId); diff --git a/audio/libshairport/files/patch-src-shairport.c b/audio/libshairport/files/patch-src_shairport.c similarity index 89% rename from audio/libshairport/files/patch-src-shairport.c rename to audio/libshairport/files/patch-src_shairport.c index 00fd93c92d1c..b26546624481 100644 --- a/audio/libshairport/files/patch-src-shairport.c +++ b/audio/libshairport/files/patch-src_shairport.c @@ -1,5 +1,5 @@ ---- src/shairport.c.orig 2011-08-21 01:57:56.000000000 +0200 -+++ src/shairport.c 2012-10-09 12:09:33.000000000 +0200 +--- src/shairport.c.orig 2011-08-20 23:57:56 UTC ++++ src/shairport.c @@ -31,6 +31,27 @@ #include "shairport.h" #include "hairtunes.h" @@ -28,7 +28,7 @@ #ifndef TRUE #define TRUE (-1) #endif -@@ -92,13 +113,26 @@ +@@ -92,13 +113,26 @@ static struct addrinfo *tAddrInfo; static char tPassword[56] = ""; static char tHWID[HWID_SIZE] = {0,51,52,53,54,55}; @@ -56,7 +56,7 @@ char tHWID_Hex[HWID_SIZE * 2 + 1]; char tKnownHwid[32]; -@@ -177,22 +211,22 @@ +@@ -177,22 +211,22 @@ int shairport_main(int argc, char **argv } else if(!strcmp(arg, "-h") || !strcmp(arg, "--help")) { @@ -90,7 +90,7 @@ return(0); } -@@ -201,11 +235,11 @@ +@@ -201,11 +235,11 @@ int shairport_main(int argc, char **argv int tPid = fork(); if(tPid < 0) { @@ -104,7 +104,7 @@ } else { -@@ -246,10 +280,10 @@ +@@ -246,10 +280,10 @@ int shairport_main(int argc, char **argv sscanf(tHWID_Hex, "%02X%02X%02X%02X%02X%02X", &tHWID[0], &tHWID[1], &tHWID[2], &tHWID[3], &tHWID[4], &tHWID[5]); } @@ -119,7 +119,7 @@ if(tSimLevel >= 1) { -@@ -263,12 +297,12 @@ +@@ -263,12 +297,12 @@ int shairport_main(int argc, char **argv #ifndef XBMC startAvahi(tHWID_Hex, tServerName, tPort); #endif @@ -134,7 +134,7 @@ return 0; } -@@ -295,7 +329,7 @@ +@@ -295,7 +329,7 @@ int shairport_loop(void) int readsock; @@ -143,7 +143,7 @@ while(m_running) { -@@ -327,7 +361,7 @@ +@@ -327,7 +361,7 @@ int shairport_loop(void) { freeaddrinfo(tAddrInfo); tAddrInfo = NULL; @@ -152,7 +152,7 @@ close(tServerSock); handleClient(tClientSock, tPassword, tHWID); //close(tClientSock); -@@ -335,11 +369,11 @@ +@@ -335,11 +369,11 @@ int shairport_loop(void) } else { @@ -166,7 +166,7 @@ handleClient(tClientSock, tPassword, tHWID); #endif } -@@ -349,7 +383,7 @@ +@@ -349,7 +383,7 @@ int shairport_loop(void) } } @@ -175,7 +175,7 @@ if(tAddrInfo != NULL) { freeaddrinfo(tAddrInfo); -@@ -360,6 +394,7 @@ +@@ -360,6 +394,7 @@ int shairport_loop(void) void shairport_exit(void) { m_running = 0; @@ -183,7 +183,7 @@ } int shairport_is_running(void) -@@ -407,7 +442,7 @@ +@@ -407,7 +442,7 @@ int findEnd(char *tReadBuf) void handleClient(int pSock, char *pPassword, char *pHWADDR) { @@ -192,7 +192,7 @@ fflush(stdout); socklen_t len; -@@ -426,7 +461,7 @@ +@@ -426,7 +461,7 @@ void handleClient(int pSock, char *pPass // deal with both IPv4 and IPv6: if (addr.ss_family == AF_INET) { @@ -201,7 +201,7 @@ struct sockaddr_in *s = (struct sockaddr_in *)&addr; port = ntohs(s->sin_port); inet_ntop(AF_INET, &s->sin_addr, ipstr, sizeof ipstr); -@@ -446,20 +481,20 @@ +@@ -446,20 +481,20 @@ void handleClient(int pSock, char *pPass if(memcmp(&addr.bin[0], "\x00\x00\x00\x00" "\x00\x00\x00\x00" "\x00\x00\xff\xff", 12) == 0) { // its ipv4... @@ -226,7 +226,7 @@ int tMoreDataNeeded = 1; struct keyring tKeys; -@@ -478,18 +513,19 @@ +@@ -478,18 +513,19 @@ void handleClient(int pSock, char *pPass while(1 == tMoreDataNeeded) { tError = readDataFromClient(pSock, &(tConn.recv)); @@ -250,7 +250,7 @@ cleanup(&tConn); // pSock was already closed return; -@@ -498,13 +534,13 @@ +@@ -498,13 +534,13 @@ void handleClient(int pSock, char *pPass } else { @@ -266,7 +266,7 @@ //tConn->resp.data[tConn->resp.current-1] = '\0'; writeDataToClient(pSock, &(tConn.resp)); // Finished reading one message... -@@ -517,9 +553,9 @@ +@@ -517,9 +553,9 @@ void handleClient(int pSock, char *pPass void writeDataToClient(int pSock, struct shairbuffer *pResponse) { @@ -278,7 +278,7 @@ } int readDataFromClient(int pSock, struct shairbuffer *pClientBuffer) -@@ -532,7 +568,7 @@ +@@ -532,7 +568,7 @@ int readDataFromClient(int pSock, struct while(tRetval > 0 && tEnd < 0) { // Read from socket until \n\n, \r\n\r\n, or \r\r is found @@ -287,7 +287,7 @@ fflush(stdout); tRetval = read(pSock, tReadBuf, MAX_SIZE); // if new buffer contains the end of request string, only copy partial buffer? -@@ -543,40 +579,40 @@ +@@ -543,40 +579,40 @@ int readDataFromClient(int pSock, struct { pClientBuffer->marker = tEnd+1; // Marks start of content } @@ -336,7 +336,7 @@ char* tFound = strstr(pBufferPtr, pField); int tSize = 0; if(tFound != NULL) -@@ -597,7 +633,7 @@ +@@ -597,7 +633,7 @@ char *getFromBuffer(char *pBufferPtr, co } tSize = (int) (tShortest - tFound); @@ -345,7 +345,7 @@ if(pReturnSize != NULL) { *pReturnSize = tSize; -@@ -605,7 +641,7 @@ +@@ -605,7 +641,7 @@ char *getFromBuffer(char *pBufferPtr, co } else { @@ -354,7 +354,7 @@ } return tFound; } -@@ -639,10 +675,10 @@ +@@ -639,10 +675,10 @@ int buildAppleResponse(struct connection { char tTrim[tFoundSize + 2]; getTrimmed(tFound, tFoundSize, TRUE, TRUE, tTrim); @@ -367,7 +367,7 @@ int tCurSize = 0; unsigned char tChalResp[38]; -@@ -664,7 +700,7 @@ +@@ -664,7 +700,7 @@ int buildAppleResponse(struct connection } char *tTmp = encode_base64((unsigned char *)tChalResp, tCurSize); @@ -376,7 +376,7 @@ free(tTmp); // RSA Encrypt -@@ -709,15 +745,15 @@ +@@ -709,15 +745,15 @@ int parseMessage(struct connection *pCon if(tContent != NULL) { int tContentSize = atoi(tContent); @@ -396,7 +396,7 @@ } } // check if value in tContent > 2nd read from client. -@@ -726,7 +762,7 @@ +@@ -726,7 +762,7 @@ int parseMessage(struct connection *pCon } else { @@ -405,7 +405,7 @@ } // "Creates" a new Response Header for our response message -@@ -739,7 +775,7 @@ +@@ -739,7 +775,7 @@ int parseMessage(struct connection *pCon { tLen = 20; } @@ -414,7 +414,7 @@ } if(pConn->password != NULL) -@@ -749,7 +785,7 @@ +@@ -749,7 +785,7 @@ int parseMessage(struct connection *pCon if(buildAppleResponse(pConn, pIpBin, pIpBinLen, pHWID)) // need to free sig { @@ -423,7 +423,7 @@ } // Find option, then based on option, do different actions. -@@ -769,14 +805,14 @@ +@@ -769,14 +805,14 @@ int parseMessage(struct connection *pCon int tKeySize = 0; char tEncodedAesIV[tSize + 2]; getTrimmed(tHeaderVal, tSize, TRUE, TRUE, tEncodedAesIV); @@ -440,7 +440,7 @@ // remove base64 coding from key char *tDecodedAesKey = decode_base64((unsigned char*) tEncodedAesKey, tKeySize, &tKeySize); // Need to free DecodedAesKey -@@ -785,7 +821,7 @@ +@@ -785,7 +821,7 @@ int parseMessage(struct connection *pCon int tFmtpSize = 0; char *tFmtp = getFromContent(tContent, "a=fmtp", &tFmtpSize); // Don't need to free tFmtp = getTrimmedMalloc(tFmtp, tFmtpSize, TRUE, FALSE); // will need to free @@ -449,7 +449,7 @@ RSA *rsa = loadKey(); // Decrypt the binary aes key -@@ -794,11 +830,11 @@ +@@ -794,11 +830,11 @@ int parseMessage(struct connection *pCon if(RSA_private_decrypt(tKeySize, (unsigned char *)tDecodedAesKey, (unsigned char*) tDecryptedKey, rsa, RSA_PKCS1_OAEP_PADDING) >= 0) { @@ -463,7 +463,7 @@ } free(tDecodedAesKey); RSA_free(rsa); -@@ -814,13 +850,13 @@ +@@ -814,13 +850,13 @@ int parseMessage(struct connection *pCon // struct comms *tComms = pConn->hairtunes; // if (! (pipe(tComms->in) == 0 && pipe(tComms->out) == 0)) // { @@ -479,7 +479,7 @@ #ifndef XBMC int tPid = fork(); if(tPid == 0) -@@ -836,11 +872,11 @@ +@@ -836,11 +872,11 @@ int parseMessage(struct connection *pCon tFound = getFromSetup(pConn->recv.data, "timing_port", &tSize); getTrimmed(tFound, tSize, 1, 0, tTPortStr); @@ -493,7 +493,7 @@ char *tRtp = NULL; char *tPipe = NULL; char *tAoDriver = NULL; -@@ -875,7 +911,7 @@ +@@ -875,7 +911,7 @@ int parseMessage(struct connection *pCon tDataport, tRtp, tPipe, tAoDriver, tAoDeviceName, tAoDeviceId); #ifndef XBMC // Quit when finished. @@ -502,7 +502,7 @@ return -1; } else if(tPid >0) -@@ -888,7 +924,7 @@ +@@ -888,7 +924,7 @@ int parseMessage(struct connection *pCon int tRead = read(tComms->out[0], tFromHairtunes, 80); if(tRead <= 0) { @@ -511,7 +511,7 @@ } else { -@@ -900,7 +936,7 @@ +@@ -900,7 +936,7 @@ int parseMessage(struct connection *pCon } else { @@ -520,7 +520,7 @@ } } -@@ -921,7 +957,7 @@ +@@ -921,7 +957,7 @@ int parseMessage(struct connection *pCon } else { @@ -529,7 +529,7 @@ return -1; } #endif -@@ -933,7 +969,7 @@ +@@ -933,7 +969,7 @@ int parseMessage(struct connection *pCon propogateCSeq(pConn); #ifndef XBMC close(pConn->hairtunes->in[1]); @@ -538,7 +538,7 @@ #else hairtunes_cleanup(); #endif -@@ -954,21 +990,73 @@ +@@ -954,21 +990,73 @@ int parseMessage(struct connection *pCon { propogateCSeq(pConn); int tSize = 0; @@ -616,7 +616,7 @@ propogateCSeq(pConn); } addToShairBuffer(&(pConn->resp), "\r\n"); -@@ -1047,7 +1135,7 @@ +@@ -1047,7 +1135,7 @@ int startAvahi(const char *pHWStr, const char tName[100 + HWID_SIZE + 3]; if(strlen(pServerName) > tMaxServerName) { @@ -625,7 +625,7 @@ "so we put a strncat in our command so we don't buffer overflow, while you listen to your flow.\n" "We just used the first %d characters. Pick something shorter if you want\n", tMaxServerName); } -@@ -1058,7 +1146,7 @@ +@@ -1058,7 +1146,7 @@ int startAvahi(const char *pHWStr, const strcat(tName, pHWStr); strcat(tName, "@"); strncat(tName, pServerName, tMaxServerName); @@ -634,7 +634,7 @@ execlp("avahi-publish-service", "avahi-publish-service", tName, "_raop._tcp", tPort, "tp=UDP","sm=false","sv=false","ek=1","et=0,1", -@@ -1070,12 +1158,12 @@ +@@ -1070,12 +1158,12 @@ int startAvahi(const char *pHWStr, const perror("error"); } @@ -650,7 +650,7 @@ } return tPid; } -@@ -1083,7 +1171,7 @@ +@@ -1083,7 +1171,7 @@ int startAvahi(const char *pHWStr, const void printBufferInfo(struct shairbuffer *pBuf, int pLevel) { @@ -659,7 +659,7 @@ } int getAvailChars(struct shairbuffer *pBuf) -@@ -1164,7 +1252,8 @@ +@@ -1164,7 +1252,8 @@ void slog(int pLevel, char *pFormat, ... { va_list argp; va_start(argp, pFormat); @@ -669,7 +669,7 @@ va_end(argp); } //#endif -@@ -1218,9 +1307,9 @@ +@@ -1218,9 +1307,9 @@ void initBuffer(struct shairbuffer *pBuf { if(pBuf->data != NULL) { @@ -681,7 +681,7 @@ } pBuf->current = 0; pBuf->marker = 0; -@@ -1278,6 +1367,6 @@ +@@ -1278,6 +1367,6 @@ RSA *loadKey() BIO *tBio = BIO_new_mem_buf(AIRPORT_PRIVATE_KEY, -1); RSA *rsa = PEM_read_bio_RSAPrivateKey(tBio, NULL, NULL, NULL); //NULL, NULL, NULL); BIO_free(tBio); diff --git a/audio/libshairport/files/patch-src-shairport.h b/audio/libshairport/files/patch-src_shairport.h similarity index 85% rename from audio/libshairport/files/patch-src-shairport.h rename to audio/libshairport/files/patch-src_shairport.h index 33337cee6792..08af5df34f1e 100644 --- a/audio/libshairport/files/patch-src-shairport.h +++ b/audio/libshairport/files/patch-src_shairport.h @@ -1,5 +1,5 @@ ---- src/shairport.h.orig 2011-08-21 01:58:11.000000000 +0200 -+++ src/shairport.h 2012-10-09 12:09:33.000000000 +0200 +--- src/shairport.h.orig 2011-08-20 23:58:11 UTC ++++ src/shairport.h @@ -11,14 +11,22 @@ #include #include @@ -27,7 +27,7 @@ struct shairbuffer { -@@ -58,13 +66,21 @@ +@@ -58,13 +66,21 @@ extern "C" { #endif /* __cplusplus */ diff --git a/audio/libshairport/files/patch-src-socketlib.c b/audio/libshairport/files/patch-src_socketlib.c similarity index 78% rename from audio/libshairport/files/patch-src-socketlib.c rename to audio/libshairport/files/patch-src_socketlib.c index c2b3e6c14b81..e9bef80a6d37 100644 --- a/audio/libshairport/files/patch-src-socketlib.c +++ b/audio/libshairport/files/patch-src_socketlib.c @@ -1,6 +1,6 @@ ---- src/socketlib.c.orig 2011-09-23 22:00:48.000000000 +0200 -+++ src/socketlib.c 2012-10-09 12:09:33.000000000 +0200 -@@ -48,7 +48,7 @@ +--- src/socketlib.c.orig 2011-09-23 20:00:48 UTC ++++ src/socketlib.c +@@ -48,7 +48,7 @@ int common_setup(struct addrinfo *pAddrI if((tSock==-1) && (pAddrInfo->ai_family == AF_INET6) && (errno == EAFNOSUPPORT)) { //Fallback to ipv4 @@ -9,7 +9,7 @@ pAddrInfo->ai_family = AF_INET; tSock = socket(pAddrInfo->ai_family, pAddrInfo->ai_socktype, 0); } -@@ -82,7 +82,7 @@ +@@ -82,7 +82,7 @@ int setup_client(struct addrinfo *server delay(RETRY_DELAY, &tRes); } } @@ -18,7 +18,7 @@ return ERROR; } -@@ -102,7 +102,7 @@ +@@ -102,7 +102,7 @@ int getAddr(char *pHostname, char *pServ tError = getaddrinfo(pHostname, pService, &hints, pAddrInfo); if(tError != 0) { @@ -27,7 +27,7 @@ } return tError; } -@@ -158,8 +158,8 @@ +@@ -158,8 +158,8 @@ int setupListenServer(struct addrinfo ** sprintf(tService, "%d", pPort); // copies port to string int tFamily = AF_INET; #ifdef AF_INET6 @@ -38,7 +38,7 @@ #else //printf("Listening on IPv4 Socket"); #endif -@@ -200,7 +200,7 @@ +@@ -200,7 +200,7 @@ static int getCorrectedEncodeSize(int pS else { // Invalid encoded data, no other cases are possible. @@ -47,7 +47,7 @@ return pSize; } } -@@ -226,7 +226,7 @@ +@@ -226,7 +226,7 @@ char *decode_base64(unsigned char *pInpu memset(input, 0, length); memcpy(input, pInput, pLength); memset(input+pLength, '=', length-pLength); diff --git a/audio/libsidplay2/files/patch-libsidplay__include__sidplay__SmartPtr.h b/audio/libsidplay2/files/patch-libsidplay_include_sidplay_SmartPtr.h similarity index 74% rename from audio/libsidplay2/files/patch-libsidplay__include__sidplay__SmartPtr.h rename to audio/libsidplay2/files/patch-libsidplay_include_sidplay_SmartPtr.h index df50ab655518..ead9dd02db64 100644 --- a/audio/libsidplay2/files/patch-libsidplay__include__sidplay__SmartPtr.h +++ b/audio/libsidplay2/files/patch-libsidplay_include_sidplay_SmartPtr.h @@ -1,6 +1,6 @@ ---- libsidplay/include/sidplay/SmartPtr.h.orig Tue Jun 15 05:08:04 2004 -+++ libsidplay/include/sidplay/SmartPtr.h Wed Aug 18 00:47:50 2004 -@@ -211,16 +211,16 @@ +--- libsidplay/include/sidplay/SmartPtr.h.orig 2004-06-14 20:08:04 UTC ++++ libsidplay/include/sidplay/SmartPtr.h +@@ -211,16 +211,16 @@ class SmartPtr_sidtt : public SmartPtrBa { if ( bufferLen >= 1 ) { diff --git a/audio/libsidplay2/files/patch-libsidutils_include_sidplay_utils_SidUsage.h b/audio/libsidplay2/files/patch-libsidutils_include_sidplay_utils_SidUsage.h index d4b172e5f743..7a93e3f13a5f 100644 --- a/audio/libsidplay2/files/patch-libsidutils_include_sidplay_utils_SidUsage.h +++ b/audio/libsidplay2/files/patch-libsidutils_include_sidplay_utils_SidUsage.h @@ -1,6 +1,6 @@ ---- libsidutils/include/sidplay/utils/SidUsage.h.orig Sat Sep 30 19:49:52 2006 -+++ libsidutils/include/sidplay/utils/SidUsage.h Sat Sep 30 19:50:54 2006 -@@ -33,7 +33,7 @@ +--- libsidutils/include/sidplay/utils/SidUsage.h.orig 2004-06-14 20:08:08 UTC ++++ libsidutils/include/sidplay/utils/SidUsage.h +@@ -33,7 +33,7 @@ struct sid2_usage_t: public sid_usage_t uint_least16_t length; // usage scan length // Copy common parts of basic usage to extended usage. diff --git a/audio/libsidplayfp/files/patch-Makefile.in b/audio/libsidplayfp/files/patch-Makefile.in index e58424cfc9a1..ac3d71f8b3cf 100644 --- a/audio/libsidplayfp/files/patch-Makefile.in +++ b/audio/libsidplayfp/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2015-01-24 15:59:52 UTC +--- Makefile.in.orig 2016-04-15 17:21:44 UTC +++ Makefile.in -@@ -2000,8 +2000,8 @@ uninstall-am: uninstall-builders_hardsid +@@ -2003,8 +2003,8 @@ uninstall-am: uninstall-builders_hardsid .a65.bin: o65file=`echo $@ | sed 's/bin/o65/'`;\ diff --git a/audio/libworkman/files/patch-Imakefile b/audio/libworkman/files/patch-Imakefile index 3d97d1abe26c..c505f5b51c50 100644 --- a/audio/libworkman/files/patch-Imakefile +++ b/audio/libworkman/files/patch-Imakefile @@ -1,6 +1,6 @@ ---- Imakefile.orig 1999-05-30 00:48:17.000000000 +0900 -+++ Imakefile 2011-08-23 13:40:41.000000000 +0900 -@@ -31,7 +31,7 @@ +--- Imakefile.orig 1999-05-29 15:48:17 UTC ++++ Imakefile +@@ -31,7 +31,7 @@ XCOMM #include "include/wm_version.h" @@ -9,7 +9,7 @@ SRCS = cddb.c cdrom.c cdinfo.c plat_freebsd.c plat_sun.c plat_hpux.c \ plat_ultrix.c plat_news.c plat_bsd386.c plat_osf1.c plat_linux.c \ -@@ -47,6 +47,7 @@ +@@ -47,6 +47,7 @@ OBJS = cddb.o cdrom.o cdinfo.o plat_free HEADERS= \ include/wm_cdda.h \ @@ -17,7 +17,7 @@ include/wm_cdinfo.h \ include/wm_cdrom.h \ include/wm_config.h \ -@@ -65,7 +66,7 @@ +@@ -65,7 +66,7 @@ HEADERS= \ #ifdef SHARED_LIBWORKMAN SharedLibraryTarget(workman,$(WM_LIBVER),$(OBJS),.,.) diff --git a/audio/libworkman/files/patch-plat_freebsd.c b/audio/libworkman/files/patch-plat__freebsd.c similarity index 53% rename from audio/libworkman/files/patch-plat_freebsd.c rename to audio/libworkman/files/patch-plat__freebsd.c index 05c1cf42c612..64d87afa63a9 100644 --- a/audio/libworkman/files/patch-plat_freebsd.c +++ b/audio/libworkman/files/patch-plat__freebsd.c @@ -1,6 +1,6 @@ ---- plat_freebsd.c.orig Thu Jan 27 12:17:46 2000 -+++ plat_freebsd.c Thu Jan 27 12:18:15 2000 -@@ -49,7 +49,6 @@ +--- plat_freebsd.c.orig 1999-03-07 08:36:40 UTC ++++ plat_freebsd.c +@@ -49,7 +49,6 @@ static char freebsd_id[] = "$Id: plat_fr #include #include #include diff --git a/audio/libworkman/files/patch-wm_helpers.c b/audio/libworkman/files/patch-wm__helpers.c similarity index 54% rename from audio/libworkman/files/patch-wm_helpers.c rename to audio/libworkman/files/patch-wm__helpers.c index 5741f350463f..447cb97f2f05 100644 --- a/audio/libworkman/files/patch-wm_helpers.c +++ b/audio/libworkman/files/patch-wm__helpers.c @@ -1,6 +1,6 @@ ---- wm_helpers.c.orig Sun Aug 8 21:05:58 1999 -+++ wm_helpers.c Sun Aug 8 21:06:12 1999 -@@ -30,7 +30,7 @@ +--- wm_helpers.c.orig 1999-03-07 08:36:41 UTC ++++ wm_helpers.c +@@ -30,7 +30,7 @@ static char wm_helpers_id[] = "$Id: wm_h #include #include diff --git a/audio/libxmp/files/patch-Makefile.in b/audio/libxmp/files/patch-Makefile.in index fa5b03c2376b..4947192cf865 100644 --- a/audio/libxmp/files/patch-Makefile.in +++ b/audio/libxmp/files/patch-Makefile.in @@ -1,4 +1,4 @@ ---- Makefile.in.orig 2015-12-31 00:25:51 UTC +--- Makefile.in.orig 2016-07-16 11:29:48 UTC +++ Makefile.in @@ -146,8 +146,8 @@ install: all @echo "Installing xmp.h..." diff --git a/audio/lingot/files/patch-Makefile.in b/audio/lingot/files/patch-Makefile.in index a51ec2fa1fce..4ec7bc92b29c 100644 --- a/audio/lingot/files/patch-Makefile.in +++ b/audio/lingot/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- ./Makefile.in.orig 2011-08-22 10:10:09.000000000 -0400 -+++ ./Makefile.in 2014-06-18 23:12:35.000000000 -0400 -@@ -291,21 +291,21 @@ +--- Makefile.in.orig 2011-08-22 14:10:09 UTC ++++ Makefile.in +@@ -291,21 +291,21 @@ SUBDIRS = po src pixmaps lingotdocdir = ${docdir} lingotdoc_DATA = \ README\ diff --git a/audio/linux-c6-pulseaudio-libs/files/patch-etc__pulse__client.conf b/audio/linux-c6-pulseaudio-libs/files/patch-etc_pulse_client.conf similarity index 63% rename from audio/linux-c6-pulseaudio-libs/files/patch-etc__pulse__client.conf rename to audio/linux-c6-pulseaudio-libs/files/patch-etc_pulse_client.conf index 7b81a1b1376b..fc17a52913fd 100644 --- a/audio/linux-c6-pulseaudio-libs/files/patch-etc__pulse__client.conf +++ b/audio/linux-c6-pulseaudio-libs/files/patch-etc_pulse_client.conf @@ -1,5 +1,5 @@ ---- ./etc/pulse/client.conf.orig 2014-08-23 02:17:24.474174232 +0200 -+++ ./etc/pulse/client.conf 2014-08-23 02:18:03.584171688 +0200 +--- etc/pulse/client.conf.orig 2016-02-03 11:05:51 UTC ++++ etc/pulse/client.conf @@ -29,5 +29,7 @@ ; cookie-file = diff --git a/audio/linux-f10-pulseaudio-libs/Makefile b/audio/linux-f10-pulseaudio-libs/Makefile index ca7d5a55e79c..512f1fb4f8ad 100644 --- a/audio/linux-f10-pulseaudio-libs/Makefile +++ b/audio/linux-f10-pulseaudio-libs/Makefile @@ -18,7 +18,7 @@ RPMVERSION= 4.fc10 SRC_DISTFILES= ${PORTNAME:S/-libs//}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX} USE_LDCONFIG= yes -pre-patch: +post-extract: @(cd ${WRKSRC}/etc/pulse && ${MV} client.conf client.conf.sample) post-patch: diff --git a/audio/linux-f10-pulseaudio-libs/files/patch-etc_pulse_client.conf.sample b/audio/linux-f10-pulseaudio-libs/files/patch-etc_pulse_client.conf.sample index 6271d209888e..faf9f1eed351 100644 --- a/audio/linux-f10-pulseaudio-libs/files/patch-etc_pulse_client.conf.sample +++ b/audio/linux-f10-pulseaudio-libs/files/patch-etc_pulse_client.conf.sample @@ -1,5 +1,5 @@ ---- etc/pulse/client.conf.sample.orig 2011-04-01 15:42:58.548733177 +0300 -+++ etc/pulse/client.conf.sample 2011-04-01 15:53:03.306719164 +0300 +--- etc/pulse/client.conf.sample.orig 2011-04-26 07:29:20 UTC ++++ etc/pulse/client.conf.sample @@ -23,11 +23,11 @@ ; default-source = ; default-server = diff --git a/audio/linuxsampler/files/patch-src-common-Mutex.cpp b/audio/linuxsampler/files/patch-src_common_Mutex.cpp similarity index 75% rename from audio/linuxsampler/files/patch-src-common-Mutex.cpp rename to audio/linuxsampler/files/patch-src_common_Mutex.cpp index 002d905521cc..6ee360146153 100644 --- a/audio/linuxsampler/files/patch-src-common-Mutex.cpp +++ b/audio/linuxsampler/files/patch-src_common_Mutex.cpp @@ -1,7 +1,7 @@ ---- src/common/Mutex.cpp.orig Tue Mar 6 20:42:00 2007 -+++ src/common/Mutex.cpp Tue Mar 6 20:42:06 2007 -@@ -35,7 +35,6 @@ - +--- src/common/Mutex.cpp.orig 2007-11-15 00:23:37 UTC ++++ src/common/Mutex.cpp +@@ -36,7 +36,6 @@ + #if !defined(WIN32) #if !defined(_XOPEN_SOURCE) || _XOPEN_SOURCE < 500 # undef _XOPEN_SOURCE -# define _XOPEN_SOURCE 500 /* to define PTHREAD_MUTEX_ERRORCHECK */ diff --git a/audio/linuxsampler/files/patch-src__common__Pool.h b/audio/linuxsampler/files/patch-src_common_Pool.h similarity index 70% rename from audio/linuxsampler/files/patch-src__common__Pool.h rename to audio/linuxsampler/files/patch-src_common_Pool.h index 02daae02c393..d87e3dbaf10d 100644 --- a/audio/linuxsampler/files/patch-src__common__Pool.h +++ b/audio/linuxsampler/files/patch-src_common_Pool.h @@ -1,6 +1,6 @@ ---- src/common/Pool.h.orig 2008-12-07 09:18:04.000000000 +0900 -+++ src/common/Pool.h 2012-10-13 04:19:19.000000000 +0900 -@@ -393,7 +393,7 @@ +--- src/common/Pool.h.orig 2008-12-07 00:18:04 UTC ++++ src/common/Pool.h +@@ -393,7 +393,7 @@ class RTList : public RTListBase { inline Iterator allocAppend() { if (pPool->poolIsEmpty()) return RTListBase::begin(); Iterator element = pPool->alloc(); diff --git a/audio/linuxsampler/files/patch-src-common-atomic.h b/audio/linuxsampler/files/patch-src_common_atomic.h similarity index 68% rename from audio/linuxsampler/files/patch-src-common-atomic.h rename to audio/linuxsampler/files/patch-src_common_atomic.h index 8a17bb03058f..7baa65962c08 100644 --- a/audio/linuxsampler/files/patch-src-common-atomic.h +++ b/audio/linuxsampler/files/patch-src_common_atomic.h @@ -1,5 +1,5 @@ ---- src/common/atomic.h.orig 2009-03-29 20:43:39.000000000 +0200 -+++ src/common/atomic.h 2009-08-22 11:21:38.000000000 +0200 +--- src/common/atomic.h.orig 2009-03-29 18:43:39 UTC ++++ src/common/atomic.h @@ -38,7 +38,7 @@ #define CONFIG_SMP /* ... the macro the kernel headers use */ #endif diff --git a/audio/linuxsampler/files/patch-src-drivers-audio-AudioChannel.cpp b/audio/linuxsampler/files/patch-src_drivers_audio_AudioChannel.cpp similarity index 63% rename from audio/linuxsampler/files/patch-src-drivers-audio-AudioChannel.cpp rename to audio/linuxsampler/files/patch-src_drivers_audio_AudioChannel.cpp index 713c1a6f0410..c70ae51ebd2f 100644 --- a/audio/linuxsampler/files/patch-src-drivers-audio-AudioChannel.cpp +++ b/audio/linuxsampler/files/patch-src_drivers_audio_AudioChannel.cpp @@ -1,5 +1,5 @@ ---- src/drivers/audio/AudioChannel.cpp.orig 2007-11-15 00:42:05.000000000 +0100 -+++ src/drivers/audio/AudioChannel.cpp 2008-11-16 01:55:40.000000000 +0100 +--- src/drivers/audio/AudioChannel.cpp.orig 2009-07-04 12:13:58 UTC ++++ src/drivers/audio/AudioChannel.cpp @@ -26,7 +26,7 @@ #include "../../common/global_private.h" #include "../../common/Thread.h" // needed for allocAlignedMem() and freeAlignedMem() diff --git a/audio/lmms/files/patch-CMakeLists.txt b/audio/lmms/files/patch-CMakeLists.txt index 07bbe10e4bd2..171163c1d05e 100644 --- a/audio/lmms/files/patch-CMakeLists.txt +++ b/audio/lmms/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2016-04-24 11:28:57 UTC +--- CMakeLists.txt.orig 2016-07-26 15:14:45 UTC +++ CMakeLists.txt @@ -325,6 +325,7 @@ ENDIF(LMMS_BUILD_WIN32) diff --git a/audio/lmms/files/patch-include_lmms__math.h b/audio/lmms/files/patch-include_lmms__math.h index 2e2ef85a9b9c..1e7b7dbbdf9d 100644 --- a/audio/lmms/files/patch-include_lmms__math.h +++ b/audio/lmms/files/patch-include_lmms__math.h @@ -1,4 +1,4 @@ ---- include/lmms_math.h.orig 2016-05-05 22:56:00 UTC +--- include/lmms_math.h.orig 2015-03-08 02:47:14 UTC +++ include/lmms_math.h @@ -26,15 +26,14 @@ #ifndef LMMS_MATH_H diff --git a/audio/lmms/files/patch-plugins_organic_organic.cpp b/audio/lmms/files/patch-plugins_organic_organic.cpp index cf24563f069e..056c3bc16cab 100644 --- a/audio/lmms/files/patch-plugins_organic_organic.cpp +++ b/audio/lmms/files/patch-plugins_organic_organic.cpp @@ -1,5 +1,5 @@ ---- plugins/organic/organic.cpp 2011-07-02 13:14:01.000000000 +0000 -+++ plugins/organic/organic.cpp.new 2011-09-28 09:55:59.000000000 +0000 +--- plugins/organic/organic.cpp.orig 2015-03-08 02:47:14 UTC ++++ plugins/organic/organic.cpp @@ -41,6 +41,9 @@ #include "embed.cpp" @@ -8,5 +8,5 @@ +#define log2f(x) (logf(x) / logf(2)) +#endif - extern "C" - { + + diff --git a/audio/lmms/files/patch-plugins_sf2_player_sf2_player.cpp b/audio/lmms/files/patch-plugins_sf2__player_sf2__player.cpp similarity index 63% rename from audio/lmms/files/patch-plugins_sf2_player_sf2_player.cpp rename to audio/lmms/files/patch-plugins_sf2__player_sf2__player.cpp index 8ac4af5f8dab..757cb2ddfeed 100644 --- a/audio/lmms/files/patch-plugins_sf2_player_sf2_player.cpp +++ b/audio/lmms/files/patch-plugins_sf2__player_sf2__player.cpp @@ -1,5 +1,5 @@ ---- plugins/sf2_player/sf2_player.cpp.orig 2011-07-02 13:14:01.000000000 +0000 -+++ plugins/sf2_player/sf2_player.cpp 2011-09-29 12:18:02.000000000 +0000 +--- plugins/sf2_player/sf2_player.cpp.orig 2015-03-08 02:47:14 UTC ++++ plugins/sf2_player/sf2_player.cpp @@ -23,6 +23,10 @@ * */ @@ -9,5 +9,5 @@ + #define log2(x) ( log (x) * (1./M_LN2) ) +#endif #include - #include #include + #include diff --git a/audio/maplay/files/patch-Makefile b/audio/maplay/files/patch-Makefile index 2b8bd0fe7c96..7c121ece4f73 100644 --- a/audio/maplay/files/patch-Makefile +++ b/audio/maplay/files/patch-Makefile @@ -1,47 +1,27 @@ -*** Makefile.orig Thu Jun 23 21:14:46 1994 ---- Makefile Thu Dec 9 06:09:27 1999 -*************** -*** 27,33 **** - # - - -! CFLAGS = $(COMPILERFLAGS) - # debugging: -ggdb -DDEBUG - # profiling: -pg (gprof) or -p (prof) - # strip command has to be removed for debugging or profiling ---- 27,33 ---- - # - - -! CFLAGS += $(COMPILERFLAGS) - # debugging: -ggdb -DDEBUG - # profiling: -pg (gprof) or -p (prof) - # strip command has to be removed for debugging or profiling -*************** -*** 39,52 **** - - .SUFFIXES: .cc - -! install: - @./configuration.sh - -- all: maplay -- - maplay: $(OBJS) - $(COMPILER) $(CFLAGS) $(OBJS) -o $@ $(LIBRARIES) -lm -- -strip $@ - - .cc.o: - $(COMPILER) -c $(CFLAGS) $(INCLUDEDIRS) $*.cc -o $@ ---- 39,49 ---- - - .SUFFIXES: .cc - -! all: - @./configuration.sh - - maplay: $(OBJS) - $(COMPILER) $(CFLAGS) $(OBJS) -o $@ $(LIBRARIES) -lm - - .cc.o: - $(COMPILER) -c $(CFLAGS) $(INCLUDEDIRS) $*.cc -o $@ +--- Makefile.orig 1994-06-23 12:14:46 UTC ++++ Makefile +@@ -27,7 +27,7 @@ + # + + +-CFLAGS = $(COMPILERFLAGS) ++CFLAGS += $(COMPILERFLAGS) + # debugging: -ggdb -DDEBUG + # profiling: -pg (gprof) or -p (prof) + # strip command has to be removed for debugging or profiling +@@ -39,14 +39,11 @@ OBJS = maplay.o ibitstream.o header.o sc + + .SUFFIXES: .cc + +-install: ++all: + @./configuration.sh + +-all: maplay +- + maplay: $(OBJS) + $(COMPILER) $(CFLAGS) $(OBJS) -o $@ $(LIBRARIES) -lm +- -strip $@ + + .cc.o: + $(COMPILER) -c $(CFLAGS) $(INCLUDEDIRS) $*.cc -o $@ diff --git a/audio/maplay/files/patch-all.h b/audio/maplay/files/patch-all.h index 05e126e58b21..65eb467c28e3 100644 --- a/audio/maplay/files/patch-all.h +++ b/audio/maplay/files/patch-all.h @@ -1,19 +1,11 @@ -*** all.h.orig Thu Jun 23 21:14:39 1994 ---- all.h Thu Dec 9 05:32:18 1999 -*************** -*** 22,28 **** - #define ALL_H - - typedef float real; // float should be enough -! typedef short bool; - typedef unsigned uint32; // 32 Bit unsigned integer - // some compilers may need "typedef unsigned long uint32" instead - typedef int int32; // 32 Bit signed integer ---- 22,28 ---- - #define ALL_H - - typedef float real; // float should be enough -! typedef short boolean; - typedef unsigned uint32; // 32 Bit unsigned integer - // some compilers may need "typedef unsigned long uint32" instead - typedef int int32; // 32 Bit signed integer +--- all.h.orig 1994-06-23 12:14:39 UTC ++++ all.h +@@ -22,7 +22,7 @@ + #define ALL_H + + typedef float real; // float should be enough +-typedef short bool; ++typedef short boolean; + typedef unsigned uint32; // 32 Bit unsigned integer + // some compilers may need "typedef unsigned long uint32" instead + typedef int int32; // 32 Bit signed integer diff --git a/audio/maplay/files/patch-configuration.sh b/audio/maplay/files/patch-configuration.sh index c60df37ab9b4..413230ebe0b9 100644 --- a/audio/maplay/files/patch-configuration.sh +++ b/audio/maplay/files/patch-configuration.sh @@ -1,32 +1,25 @@ -*** configuration.sh.orig Thu Jun 23 21:14:46 1994 ---- configuration.sh Thu Dec 9 05:21:02 1999 -*************** -*** 72,77 **** ---- 72,87 ---- - INCLUDEDIRS= - LIBRARIES= - AUDIO_INCLUDES='#include ' ;; -+ FreeBSD*) -+ COMPILER='${CXX}' -+ if [ ${ARCH} = "i386" ]; then -+ COMPILERFLAGS='-DLINUX -DDAMN_INTEL_BYTE_ORDER' -+ else -+ COMPILERFLAGS='-DLINUX' -+ fi -+ INCLUDEDIRS= -+ LIBRARIES= -+ AUDIO_INCLUDES='#include ' ;; - Linux*) - COMPILER=g++ - COMPILERFLAGS='-O2 -m486 -funroll-loops -DLINUX -DDAMN_INTEL_BYTE_ORDER' -*************** -*** 95,98 **** - echo $AUDIO_INCLUDES >audio_includes.h - fi - -! make all ---- 105,108 ---- - echo $AUDIO_INCLUDES >audio_includes.h - fi - -! make maplay +--- configuration.sh.orig 1994-06-23 12:14:46 UTC ++++ configuration.sh +@@ -72,6 +72,16 @@ case `uname -sr` in + INCLUDEDIRS= + LIBRARIES= + AUDIO_INCLUDES='#include ' ;; ++ FreeBSD*) ++ COMPILER='${CXX}' ++ if [ ${ARCH} = "i386" ]; then ++ COMPILERFLAGS='-DLINUX -DDAMN_INTEL_BYTE_ORDER' ++ else ++ COMPILERFLAGS='-DLINUX' ++ fi ++ INCLUDEDIRS= ++ LIBRARIES= ++ AUDIO_INCLUDES='#include ' ;; + Linux*) + COMPILER=g++ + COMPILERFLAGS='-O2 -m486 -funroll-loops -DLINUX -DDAMN_INTEL_BYTE_ORDER' +@@ -95,4 +105,4 @@ if [ ! -f audio_includes.h ]; then + echo $AUDIO_INCLUDES >audio_includes.h + fi + +-make all ++make maplay diff --git a/audio/maplay/files/patch-crc.cc b/audio/maplay/files/patch-crc.cc index 909f2e3255b0..a696e814000e 100644 --- a/audio/maplay/files/patch-crc.cc +++ b/audio/maplay/files/patch-crc.cc @@ -1,5 +1,5 @@ ---- crc.cc.orig Thu Nov 21 16:44:18 2002 -+++ crc.cc Thu Nov 21 16:44:30 2002 +--- crc.cc.orig 1994-06-23 12:14:35 UTC ++++ crc.cc @@ -18,7 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -9,7 +9,7 @@ #include #include "crc.h" -@@ -32,7 +32,7 @@ +@@ -32,7 +32,7 @@ void Crc16::add_bits (uint32 bitstring, #ifdef DEBUG if (!length) { diff --git a/audio/maplay/files/patch-header.cc b/audio/maplay/files/patch-header.cc index cf3ef91f6e41..2aa843b5a4fe 100644 --- a/audio/maplay/files/patch-header.cc +++ b/audio/maplay/files/patch-header.cc @@ -1,5 +1,5 @@ ---- header.cc.orig Thu Jun 23 22:14:35 1994 -+++ header.cc Thu Nov 21 16:42:47 2002 +--- header.cc.orig 1994-06-23 12:14:35 UTC ++++ header.cc @@ -20,15 +20,15 @@ /* @@ -29,7 +29,7 @@ { uint32 headerstring; -@@ -45,41 +45,41 @@ +@@ -45,41 +45,41 @@ bool Header::read_header (Ibitstream *st if ((headerstring & 0xFFF80000) != 0xFFF80000) { @@ -81,7 +81,7 @@ exit (1); } h_padding_bit = (headerstring >> 9) & 1; -@@ -90,7 +90,7 @@ +@@ -90,7 +90,7 @@ bool Header::read_header (Ibitstream *st h_mode != single_channel) || (h_bitrate_index >= 11 && h_mode == single_channel)) { @@ -90,7 +90,7 @@ " mode: " << mode_string () << "\n bitrate: " << bitrate_string () << '\n'; exit (1); -@@ -161,7 +161,7 @@ +@@ -161,7 +161,7 @@ uint32 Header::calculate_framesize () static const int32 bitrates_layer_2[15] = { 0 /*free format*/, 32000, 48000, 56000, 64000, 80000, 96000, 112000, 128000, 160000, 192000, 224000, 256000, 320000, 384000 }; diff --git a/audio/maplay/files/patch-header.h b/audio/maplay/files/patch-header.h index 342deecaf589..be0a83a8c978 100644 --- a/audio/maplay/files/patch-header.h +++ b/audio/maplay/files/patch-header.h @@ -1,61 +1,36 @@ -*** header.h.orig Thu Jun 23 21:14:40 1994 ---- header.h Thu Dec 9 05:45:44 1999 -*************** -*** 39,45 **** - e_mode h_mode; - e_sample_frequency h_sample_frequency; - uint32 h_number_of_subbands, h_intensity_stereo_bound; -! bool h_copyright, h_original; - Crc16 *crc; - uint16 checksum; - ---- 39,45 ---- - e_mode h_mode; - e_sample_frequency h_sample_frequency; - uint32 h_number_of_subbands, h_intensity_stereo_bound; -! boolean h_copyright, h_original; - Crc16 *crc; - uint16 checksum; - -*************** -*** 48,54 **** - public: - Header (void) { crc = (Crc16 *)0; } - ~Header (void) { if (crc) delete crc; } -! bool read_header (Ibitstream *, Crc16 **); - // read a 32-bit header from the bitstream - - // functions to query header contents: ---- 48,54 ---- - public: - Header (void) { crc = (Crc16 *)0; } - ~Header (void) { if (crc) delete crc; } -! boolean read_header (Ibitstream *, Crc16 **); - // read a 32-bit header from the bitstream - - // functions to query header contents: -*************** -*** 58,68 **** - uint32 frequency (void) { return frequencies[h_sample_frequency]; } - static uint32 frequency (e_sample_frequency rate) { return frequencies[rate]; } - e_mode mode (void) { return h_mode; }; -! bool checksums (void) { return !h_protection_bit; } -! bool copyright (void) { return h_copyright; } -! bool original (void) { return h_original; } - -! bool checksum_ok (void) { return checksum == crc->checksum (); } - // compares computed checksum with stream checksum - - // functions which return header informations as strings: ---- 58,68 ---- - uint32 frequency (void) { return frequencies[h_sample_frequency]; } - static uint32 frequency (e_sample_frequency rate) { return frequencies[rate]; } - e_mode mode (void) { return h_mode; }; -! boolean checksums (void) { return !h_protection_bit; } -! boolean copyright (void) { return h_copyright; } -! boolean original (void) { return h_original; } - -! boolean checksum_ok (void) { return checksum == crc->checksum (); } - // compares computed checksum with stream checksum - - // functions which return header informations as strings: +--- header.h.orig 1994-06-23 12:14:40 UTC ++++ header.h +@@ -39,7 +39,7 @@ class Header + e_mode h_mode; + e_sample_frequency h_sample_frequency; + uint32 h_number_of_subbands, h_intensity_stereo_bound; +- bool h_copyright, h_original; ++ boolean h_copyright, h_original; + Crc16 *crc; + uint16 checksum; + +@@ -48,7 +48,7 @@ class Header + public: + Header (void) { crc = (Crc16 *)0; } + ~Header (void) { if (crc) delete crc; } +- bool read_header (Ibitstream *, Crc16 **); ++ boolean read_header (Ibitstream *, Crc16 **); + // read a 32-bit header from the bitstream + + // functions to query header contents: +@@ -58,11 +58,11 @@ public: + uint32 frequency (void) { return frequencies[h_sample_frequency]; } + static uint32 frequency (e_sample_frequency rate) { return frequencies[rate]; } + e_mode mode (void) { return h_mode; }; +- bool checksums (void) { return !h_protection_bit; } +- bool copyright (void) { return h_copyright; } +- bool original (void) { return h_original; } ++ boolean checksums (void) { return !h_protection_bit; } ++ boolean copyright (void) { return h_copyright; } ++ boolean original (void) { return h_original; } + +- bool checksum_ok (void) { return checksum == crc->checksum (); } ++ boolean checksum_ok (void) { return checksum == crc->checksum (); } + // compares computed checksum with stream checksum + + // functions which return header informations as strings: diff --git a/audio/maplay/files/patch-ibitstream.cc b/audio/maplay/files/patch-ibitstream.cc index 39e9a19b65cf..b025c7d07328 100644 --- a/audio/maplay/files/patch-ibitstream.cc +++ b/audio/maplay/files/patch-ibitstream.cc @@ -1,5 +1,5 @@ ---- ibitstream.cc.orig Thu Jun 23 22:14:35 1994 -+++ ibitstream.cc Thu Nov 21 16:41:11 2002 +--- ibitstream.cc.orig 1994-06-23 12:14:35 UTC ++++ ibitstream.cc @@ -29,7 +29,7 @@ #include #include @@ -9,7 +9,7 @@ #include "all.h" #include "ibitstream.h" -@@ -50,7 +50,7 @@ +@@ -50,7 +50,7 @@ Ibitstream::Ibitstream (const char *file { if ((fd = open (filename, O_RDONLY, 0)) < 0) { @@ -18,7 +18,7 @@ exit (1); } wordpointer = buffer; -@@ -64,7 +64,7 @@ +@@ -64,7 +64,7 @@ Ibitstream::~Ibitstream (void) // des } @@ -27,7 +27,7 @@ { int readvalue; -@@ -102,13 +102,13 @@ +@@ -102,13 +102,13 @@ bool Ibitstream::get_header (uint32 *hea } @@ -43,7 +43,7 @@ exit (1); } -@@ -170,7 +170,7 @@ +@@ -170,7 +170,7 @@ uint32 Ibitstream::get_bits (uint32 numb #ifdef DEBUG if (number_of_bits < 1 || number_of_bits > 16) { @@ -52,7 +52,7 @@ exit (1); } #endif -@@ -184,7 +184,7 @@ +@@ -184,7 +184,7 @@ uint32 Ibitstream::get_bits (uint32 numb bitindex = 0; if ((char *)++wordpointer > (char *)buffer + framesize) { @@ -61,7 +61,7 @@ exit (1); } } -@@ -197,7 +197,7 @@ +@@ -197,7 +197,7 @@ uint32 Ibitstream::get_bits (uint32 numb *(int16 *)&returnvalue = *((int16 *)wordpointer + 1); if ((char *)++wordpointer > (char *)buffer + framesize) { @@ -70,7 +70,7 @@ exit (1); } *((int16 *)&returnvalue + 1) = *(int16 *)wordpointer; -@@ -205,7 +205,7 @@ +@@ -205,7 +205,7 @@ uint32 Ibitstream::get_bits (uint32 numb *((int16 *)&returnvalue + 1) = *(int16 *)wordpointer; if ((char *)++wordpointer > (char *)buffer + framesize) { diff --git a/audio/maplay/files/patch-ibitstream.h b/audio/maplay/files/patch-ibitstream.h index fb92627bd6e6..8da2fbf03bb9 100644 --- a/audio/maplay/files/patch-ibitstream.h +++ b/audio/maplay/files/patch-ibitstream.h @@ -1,25 +1,15 @@ -*** ibitstream.h.orig Thu Jun 23 21:14:40 1994 ---- ibitstream.h Thu Dec 9 05:32:18 1999 -*************** -*** 43,52 **** - ~Ibitstream (void); - int filedescriptor (void) { return fd; }; - -! bool get_header (uint32 *); - // get next 32 bits from bitstream in an unsigned int, - // returned value False => end of stream -! bool read_frame (uint32 bytesize); - // fill buffer with data from bitstream, returned value False => end of stream - uint32 get_bits (uint32 number_of_bits); - // read bits (1 <= number_of_bits <= 16) from buffer into the lower bits ---- 43,52 ---- - ~Ibitstream (void); - int filedescriptor (void) { return fd; }; - -! boolean get_header (uint32 *); - // get next 32 bits from bitstream in an unsigned int, - // returned value False => end of stream -! boolean read_frame (uint32 bytesize); - // fill buffer with data from bitstream, returned value False => end of stream - uint32 get_bits (uint32 number_of_bits); - // read bits (1 <= number_of_bits <= 16) from buffer into the lower bits +--- ibitstream.h.orig 1994-06-23 12:14:40 UTC ++++ ibitstream.h +@@ -43,10 +43,10 @@ public: + ~Ibitstream (void); + int filedescriptor (void) { return fd; }; + +- bool get_header (uint32 *); ++ boolean get_header (uint32 *); + // get next 32 bits from bitstream in an unsigned int, + // returned value False => end of stream +- bool read_frame (uint32 bytesize); ++ boolean read_frame (uint32 bytesize); + // fill buffer with data from bitstream, returned value False => end of stream + uint32 get_bits (uint32 number_of_bits); + // read bits (1 <= number_of_bits <= 16) from buffer into the lower bits diff --git a/audio/maplay/files/patch-maplay.cc b/audio/maplay/files/patch-maplay.cc index efc0b0d38535..e42a69af4179 100644 --- a/audio/maplay/files/patch-maplay.cc +++ b/audio/maplay/files/patch-maplay.cc @@ -1,5 +1,5 @@ ---- maplay.cc.orig 1994-06-23 08:14:36.000000000 -0400 -+++ maplay.cc 2014-07-27 09:22:27.000000000 -0400 +--- maplay.cc.orig 1994-06-23 12:14:36 UTC ++++ maplay.cc @@ -39,8 +39,8 @@ #include #include @@ -34,7 +34,7 @@ static real scalefactor; // data extracted from header of first frame: -@@ -90,15 +89,15 @@ +@@ -90,15 +89,15 @@ static void Exit (int returncode) } @@ -53,7 +53,7 @@ << " [-v] [-s] [-l] [-r] " #ifdef SPARC "[-us] [-uh] " -@@ -146,6 +145,9 @@ +@@ -146,6 +145,9 @@ usage: #ifdef Solaris "SPARC Solaris 2.x" #else @@ -63,7 +63,7 @@ #ifdef LINUX "Linux" #else -@@ -159,6 +161,7 @@ +@@ -159,6 +161,7 @@ usage: #endif #endif #endif @@ -71,7 +71,7 @@ " version)\n" "@(#) Copyright (C) 1993, 1994 Tobias Bading (bading@cs.tu-berlin.de)\n" "@(#) Berlin University of Technology\n" -@@ -216,7 +219,7 @@ +@@ -216,7 +219,7 @@ usage: case 'f': if (++i == argc) { @@ -80,7 +80,7 @@ exit (1); } use_own_scalefactor = True; -@@ -243,7 +246,7 @@ +@@ -243,7 +246,7 @@ usage: header = new Header; if (!header->read_header (stream, &crc)) { @@ -89,7 +89,7 @@ Exit (1); } -@@ -328,7 +331,7 @@ +@@ -328,7 +331,7 @@ usage: // } //#else { @@ -98,7 +98,7 @@ "Please use the stdout mode.\n"; Exit (0); } -@@ -345,22 +348,22 @@ +@@ -345,22 +348,22 @@ usage: ++name; else name = filename; @@ -129,7 +129,7 @@ } do -@@ -371,20 +374,20 @@ +@@ -371,20 +374,20 @@ usage: { // layer switching is allowed if (verbose_mode) @@ -153,7 +153,7 @@ Exit (1); } -@@ -423,7 +426,7 @@ +@@ -423,7 +426,7 @@ usage: } else { @@ -162,7 +162,7 @@ Exit (0); } -@@ -463,7 +466,7 @@ +@@ -463,7 +466,7 @@ usage: } else // Sh*t! Wrong crc checksum in frame! @@ -171,7 +171,7 @@ for (i = 0; i < header->number_of_subbands (); ++i) delete subbands[i]; -@@ -481,18 +484,18 @@ +@@ -481,18 +484,18 @@ usage: // check whether (one of) the filter(s) produced values not in [-1.0, 1.0]: if (range_violations) { @@ -197,7 +197,7 @@ } } if (verbose_mode) -@@ -502,13 +505,13 @@ +@@ -502,13 +505,13 @@ usage: uint32 minutes = (uint32)(playtime / 60.0); uint32 seconds = (uint32)playtime - minutes * 60; uint32 centiseconds = (uint32)((playtime - (real)(minutes * 60) - (real)seconds) * 100.0); diff --git a/audio/maplay/files/patch-obuffer.cc b/audio/maplay/files/patch-obuffer.cc index 84acbef6212f..e1beded33c34 100644 --- a/audio/maplay/files/patch-obuffer.cc +++ b/audio/maplay/files/patch-obuffer.cc @@ -1,5 +1,5 @@ ---- obuffer.cc.orig Mon Jun 27 21:14:03 1994 -+++ obuffer.cc Thu Nov 21 16:45:14 2002 +--- obuffer.cc.orig 1994-06-27 11:14:03 UTC ++++ obuffer.cc @@ -47,7 +47,7 @@ #include #include @@ -9,7 +9,7 @@ #include "obuffer.h" #include "header.h" #ifdef ULAW -@@ -65,14 +65,14 @@ +@@ -65,14 +65,14 @@ FileObuffer::FileObuffer (uint32 number_ #ifdef DEBUG if (!number_of_channels || number_of_channels > MAXCHANNELS) { @@ -26,7 +26,7 @@ #endif channels = number_of_channels; for (int i = 0; i < number_of_channels; ++i) -@@ -85,12 +85,12 @@ +@@ -85,12 +85,12 @@ void FileObuffer::append (uint32 channel #ifdef DEBUG if (channel >= channels) { @@ -41,7 +41,7 @@ exit (1); } #endif -@@ -143,7 +143,7 @@ +@@ -143,7 +143,7 @@ IndigoObuffer::IndigoObuffer (uint32 num #ifdef DEBUG if (!number_of_channels || number_of_channels > MAXCHANNELS) { @@ -50,7 +50,7 @@ exit (1); } #endif -@@ -155,7 +155,7 @@ +@@ -155,7 +155,7 @@ IndigoObuffer::IndigoObuffer (uint32 num ALconfig config; if (!(config = ALnewconfig ())) { @@ -59,7 +59,7 @@ exit (1); } ALsetwidth (config, AL_SAMPLE_16); -@@ -165,7 +165,7 @@ +@@ -165,7 +165,7 @@ IndigoObuffer::IndigoObuffer (uint32 num ALsetchannels (config, AL_STEREO); if (!(port = ALopenport ("MPEG audio player", "w", config))) { @@ -68,7 +68,7 @@ exit (1); } -@@ -190,12 +190,12 @@ +@@ -190,12 +190,12 @@ void IndigoObuffer::append (uint32 chann #ifdef DEBUG if (channel >= channels) { @@ -83,7 +83,7 @@ exit (1); } #endif -@@ -217,17 +217,17 @@ +@@ -217,17 +217,17 @@ void IndigoObuffer::write_buffer (int) int SparcObuffer::audio_fd = -1; #ifdef ULAW @@ -104,7 +104,7 @@ exit (1); } #endif -@@ -235,7 +235,7 @@ +@@ -235,7 +235,7 @@ SparcObuffer::SparcObuffer (uint32 numbe if (audio_fd < 0) { @@ -113,7 +113,7 @@ "by SparcObuffer::class_suitable()!\n"; exit (1); } -@@ -296,7 +296,7 @@ +@@ -296,7 +296,7 @@ void SparcObuffer::append (uint32 channe #ifdef DEBUG if (bufferp - buffer >= OBUFFERSIZE >> 1) { @@ -122,7 +122,7 @@ exit (1); } #endif -@@ -307,12 +307,12 @@ +@@ -307,12 +307,12 @@ void SparcObuffer::append (uint32 channe #ifdef DEBUG if (channel >= channels) { @@ -137,7 +137,7 @@ exit (1); } #endif -@@ -351,7 +351,7 @@ +@@ -351,7 +351,7 @@ int SparcObuffer::open_audio_device (voi if ((fd = open ("/dev/audio", O_WRONLY | O_NDELAY, 0)) < 0) if (errno == EBUSY) { @@ -146,7 +146,7 @@ exit (1); } else -@@ -398,7 +398,7 @@ +@@ -398,7 +398,7 @@ int SparcObuffer::get_device_type (int f } return devtype; #else @@ -155,7 +155,7 @@ return -1; #endif } -@@ -406,15 +406,15 @@ +@@ -406,15 +406,15 @@ int SparcObuffer::get_device_type (int f #ifdef ULAW @@ -174,7 +174,7 @@ "Please use the option -l or -r for stereo streams.\n"; return False; } -@@ -436,7 +436,7 @@ +@@ -436,7 +436,7 @@ bool SparcObuffer::class_suitable (void) return True; else if (!strcmp (devtype.name, "SUNW,dbri")) { @@ -183,7 +183,7 @@ "but this binary was compiled for 8 kHz u-law ouput. (telephone quality)\n" "Please recompile it without the ULAW define in COMPILERFLAGS.\n" "(or use the -amd option to use this binary with low-quality output)\n"; -@@ -448,7 +448,7 @@ +@@ -448,7 +448,7 @@ bool SparcObuffer::class_suitable (void) return True; else if (!strcmp (devtype.name, "SUNW,am79c30")) { @@ -192,7 +192,7 @@ "but this binary was compiled for CD-quality output.\n" "Please recompile it with ULAW defined in COMPILERFLAGS\n" "or use it in stdout mode as an decoder only.\n"; -@@ -464,7 +464,7 @@ +@@ -464,7 +464,7 @@ bool SparcObuffer::class_suitable (void) # ifdef ULAW return True; # else @@ -201,7 +201,7 @@ "but this binary was compiled for CD-quality output.\n" "Please recompile it with ULAW defined in COMPILERFLAGS\n" "or use it in stdout mode as an decoder only.\n"; -@@ -479,7 +479,7 @@ +@@ -479,7 +479,7 @@ bool SparcObuffer::class_suitable (void) return True; else if (device_type == AUDIO_DEV_SPEAKERBOX) { @@ -210,7 +210,7 @@ "but this binary was compiled for 8 kHz u-law ouput. (telephone quality)\n" "Please recompile it without the ULAW define in COMPILERFLAGS.\n" "(or use the -amd option to use this binary with low-quality output)\n"; -@@ -491,7 +491,7 @@ +@@ -491,7 +491,7 @@ bool SparcObuffer::class_suitable (void) return True; else if (device_type == AUDIO_DEV_AMD) { @@ -219,7 +219,7 @@ "but this binary was compiled for CD-quality output.\n" "Please recompile it with ULAW defined in COMPILERFLAGS\n" "or use it in stdout mode as an decoder only.\n"; -@@ -504,7 +504,7 @@ +@@ -504,7 +504,7 @@ bool SparcObuffer::class_suitable (void) #ifndef SunOS4_1_1 close (audio_fd); @@ -228,7 +228,7 @@ # ifdef ULAW "Please try the -amd option or use the stdout mode.\n"; # else -@@ -527,7 +527,7 @@ +@@ -527,7 +527,7 @@ int LinuxObuffer::open_audio_device (voi if ((fd = open ("/dev/dsp", O_WRONLY | O_NDELAY, 0)) < 0) if (errno == EBUSY) { @@ -237,7 +237,7 @@ exit (1); } else -@@ -537,6 +537,7 @@ +@@ -537,6 +537,7 @@ int LinuxObuffer::open_audio_device (voi } // turn NDELAY mode off: @@ -245,7 +245,7 @@ int flags; if ((flags = fcntl (fd, F_GETFL, 0)) < 0) { -@@ -549,6 +550,7 @@ +@@ -549,6 +550,7 @@ int LinuxObuffer::open_audio_device (voi perror ("fcntl F_SETFL on /dev/audio failed"); exit (1); } @@ -253,7 +253,7 @@ return fd; } -@@ -558,7 +560,7 @@ +@@ -558,7 +560,7 @@ LinuxObuffer::LinuxObuffer (uint32 numbe #ifdef DEBUG if (!number_of_channels || number_of_channels > MAXCHANNELS) { @@ -262,7 +262,7 @@ exit (1); } #endif -@@ -568,7 +570,7 @@ +@@ -568,7 +570,7 @@ LinuxObuffer::LinuxObuffer (uint32 numbe if (audio_fd < 0) { @@ -271,7 +271,7 @@ "by LinuxObuffer::class_suitable()!\n"; exit (1); } -@@ -602,12 +604,12 @@ +@@ -602,12 +604,12 @@ void LinuxObuffer::append (uint32 channe #ifdef DEBUG if (channel >= channels) { @@ -286,7 +286,7 @@ exit (1); } #endif -@@ -629,7 +631,7 @@ +@@ -629,7 +631,7 @@ void LinuxObuffer::write_buffer (int) } diff --git a/audio/maplay/files/patch-obuffer.h b/audio/maplay/files/patch-obuffer.h index 01a70fbd3c55..7362f7a22b40 100644 --- a/audio/maplay/files/patch-obuffer.h +++ b/audio/maplay/files/patch-obuffer.h @@ -1,5 +1,5 @@ ---- obuffer.h.orig Thu Jun 23 22:14:40 1994 -+++ obuffer.h Thu Nov 21 16:35:11 2002 +--- obuffer.h.orig 1994-06-23 12:14:40 UTC ++++ obuffer.h @@ -27,7 +27,7 @@ #ifndef OBUFFER_H #define OBUFFER_H @@ -9,7 +9,7 @@ #include #include #include "all.h" -@@ -123,20 +123,20 @@ +@@ -123,20 +123,20 @@ private: public: #ifdef ULAW @@ -34,7 +34,7 @@ // returnvalue == False: no 16-bit output possible (class unsuitable) #endif }; -@@ -159,7 +159,7 @@ +@@ -159,7 +159,7 @@ public: void append (uint32 channel, int16 value); void write_buffer (int dummy); diff --git a/audio/maplay/files/patch-subband.h b/audio/maplay/files/patch-subband.h index cca6875c8c00..a54ee49a9ba4 100644 --- a/audio/maplay/files/patch-subband.h +++ b/audio/maplay/files/patch-subband.h @@ -1,21 +1,13 @@ -*** subband.h.orig Thu Jun 23 21:14:40 1994 ---- subband.h Thu Dec 9 05:45:45 1999 -*************** -*** 35,42 **** - public: - virtual void read_allocation (Ibitstream *, Header *, Crc16 *) = 0; - virtual void read_scalefactor (Ibitstream *, Header *) = 0; -! virtual bool read_sampledata (Ibitstream *) = 0; -! virtual bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *) = 0; - }; - - #endif ---- 35,42 ---- - public: - virtual void read_allocation (Ibitstream *, Header *, Crc16 *) = 0; - virtual void read_scalefactor (Ibitstream *, Header *) = 0; -! virtual boolean read_sampledata (Ibitstream *) = 0; -! virtual boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *) = 0; - }; - - #endif +--- subband.h.orig 1994-06-23 12:14:40 UTC ++++ subband.h +@@ -35,8 +35,8 @@ class Subband + public: + virtual void read_allocation (Ibitstream *, Header *, Crc16 *) = 0; + virtual void read_scalefactor (Ibitstream *, Header *) = 0; +- virtual bool read_sampledata (Ibitstream *) = 0; +- virtual bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *) = 0; ++ virtual boolean read_sampledata (Ibitstream *) = 0; ++ virtual boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *) = 0; + }; + + #endif diff --git a/audio/maplay/files/patch-subband_layer_1.cc b/audio/maplay/files/patch-subband__layer__1.cc similarity index 85% rename from audio/maplay/files/patch-subband_layer_1.cc rename to audio/maplay/files/patch-subband__layer__1.cc index aab7048c5e04..330b8fb14a98 100644 --- a/audio/maplay/files/patch-subband_layer_1.cc +++ b/audio/maplay/files/patch-subband__layer__1.cc @@ -1,6 +1,6 @@ ---- subband_layer_1.cc.orig Thu Jun 23 22:14:36 1994 -+++ subband_layer_1.cc Thu Nov 21 16:43:38 2002 -@@ -67,7 +67,7 @@ +--- subband_layer_1.cc.orig 1994-06-23 12:14:36 UTC ++++ subband_layer_1.cc +@@ -67,7 +67,7 @@ SubbandLayer1::SubbandLayer1 (uint32 sub void SubbandLayer1::read_allocation (Ibitstream *stream, Header *, Crc16 *crc) { if ((allocation = stream->get_bits (4)) == 15) @@ -9,7 +9,7 @@ if (crc) crc->add_bits (allocation, 4); if (allocation) -@@ -86,14 +86,14 @@ +@@ -86,14 +86,14 @@ void SubbandLayer1::read_scalefactor (Ib } @@ -26,7 +26,7 @@ #endif } if (++samplenumber == 12) -@@ -105,7 +105,7 @@ +@@ -105,7 +105,7 @@ bool SubbandLayer1::read_sampledata (Ibi } @@ -35,7 +35,7 @@ SynthesisFilter *filter1, SynthesisFilter *) { if (allocation && channels != right) -@@ -113,7 +113,7 @@ +@@ -113,7 +113,7 @@ bool SubbandLayer1::put_next_sample (e_c register real scaled_sample = (sample * factor + offset) * scalefactor; #ifdef DEBUG if (scaled_sample < -1.0 || scaled_sample > 1.0) @@ -44,7 +44,7 @@ // this should never occur #endif filter1->input_sample (scaled_sample, subbandnumber); -@@ -142,7 +142,7 @@ +@@ -142,7 +142,7 @@ void SubbandLayer1IntensityStereo::read_ } @@ -53,7 +53,7 @@ SynthesisFilter *filter1, SynthesisFilter *filter2) { if (allocation) -@@ -154,7 +154,7 @@ +@@ -154,7 +154,7 @@ bool SubbandLayer1IntensityStereo::put_n sample2 = sample * channel2_scalefactor; #ifdef DEBUG if (sample1 < -1.0 || sample1 > 1.0 || sample2 < -1.0 || sample2 > 1.0) @@ -62,7 +62,7 @@ // this should never occur #endif filter1->input_sample (sample1, subbandnumber); -@@ -165,7 +165,7 @@ +@@ -165,7 +165,7 @@ bool SubbandLayer1IntensityStereo::put_n register real sample1 = sample * scalefactor; #ifdef DEBUG if (sample1 < -1.0 || sample1 > 1.0) @@ -71,7 +71,7 @@ // this should never occur #endif filter1->input_sample (sample1, subbandnumber); -@@ -175,7 +175,7 @@ +@@ -175,7 +175,7 @@ bool SubbandLayer1IntensityStereo::put_n register real sample2 = sample * channel2_scalefactor; #ifdef DEBUG if (sample2 < -1.0 || sample2 > 1.0) @@ -80,7 +80,7 @@ // this should never occur #endif filter1->input_sample (sample2, subbandnumber); -@@ -206,7 +206,7 @@ +@@ -206,7 +206,7 @@ void SubbandLayer1Stereo::read_allocatio crc->add_bits (channel2_allocation, 4); } if (allocation == 15 || channel2_allocation == 15) @@ -89,7 +89,7 @@ if (allocation) { samplelength = allocation + 1; -@@ -231,22 +231,22 @@ +@@ -231,22 +231,22 @@ void SubbandLayer1Stereo::read_scalefact } @@ -116,7 +116,7 @@ SynthesisFilter *filter1, SynthesisFilter *filter2) { SubbandLayer1::put_next_sample (channels, filter1, filter2); -@@ -256,7 +256,7 @@ +@@ -256,7 +256,7 @@ bool SubbandLayer1Stereo::put_next_sampl channel2_scalefactor; #ifdef DEBUG if (sample2 < -1.0 || sample2 > 1.0) diff --git a/audio/maplay/files/patch-subband__layer__1.h b/audio/maplay/files/patch-subband__layer__1.h new file mode 100644 index 000000000000..81f58632fabf --- /dev/null +++ b/audio/maplay/files/patch-subband__layer__1.h @@ -0,0 +1,38 @@ +--- subband_layer_1.h.orig 1994-06-23 12:14:40 UTC ++++ subband_layer_1.h +@@ -42,8 +42,8 @@ public: + SubbandLayer1 (uint32 subbandnumber); + void read_allocation (Ibitstream *, Header *, Crc16 *); + void read_scalefactor (Ibitstream *, Header *); +- bool read_sampledata (Ibitstream *); +- bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); ++ boolean read_sampledata (Ibitstream *); ++ boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); + }; + + +@@ -60,11 +60,11 @@ public: + SubbandLayer1::read_allocation (stream, header, crc); + } + void read_scalefactor (Ibitstream *, Header *); +- bool read_sampledata (Ibitstream *stream) ++ boolean read_sampledata (Ibitstream *stream) + { + return SubbandLayer1::read_sampledata (stream); + } +- bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); ++ boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); + }; + + +@@ -82,8 +82,8 @@ public: + SubbandLayer1Stereo (uint32 subbandnumber); + void read_allocation (Ibitstream *, Header *, Crc16 *); + void read_scalefactor (Ibitstream *, Header *); +- bool read_sampledata (Ibitstream *); +- bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); ++ boolean read_sampledata (Ibitstream *); ++ boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); + }; + + #endif diff --git a/audio/maplay/files/patch-subband__layer__2.cc b/audio/maplay/files/patch-subband__layer__2.cc new file mode 100644 index 000000000000..e0ad1297cde8 --- /dev/null +++ b/audio/maplay/files/patch-subband__layer__2.cc @@ -0,0 +1,54 @@ +--- subband_layer_2.cc.orig 1994-06-23 12:14:36 UTC ++++ subband_layer_2.cc +@@ -591,7 +591,7 @@ void SubbandLayer2::read_scalefactor (Ib + } + + +-bool SubbandLayer2::read_sampledata (Ibitstream *stream) ++boolean SubbandLayer2::read_sampledata (Ibitstream *stream) + { + if (allocation) + if (groupingtable) +@@ -633,7 +633,7 @@ bool SubbandLayer2::read_sampledata (Ibi + } + + +-bool SubbandLayer2::put_next_sample (e_channels channels, ++boolean SubbandLayer2::put_next_sample (e_channels channels, + SynthesisFilter *filter1, SynthesisFilter *) + { + #ifdef DEBUG +@@ -726,7 +726,7 @@ void SubbandLayer2IntensityStereo::read_ + } + + +-bool SubbandLayer2IntensityStereo::put_next_sample (e_channels channels, ++boolean SubbandLayer2IntensityStereo::put_next_sample (e_channels channels, + SynthesisFilter *filter1, SynthesisFilter *filter2) + { + #ifdef DEBUG +@@ -880,9 +880,9 @@ void SubbandLayer2Stereo::read_scalefact + } + + +-bool SubbandLayer2Stereo::read_sampledata (Ibitstream *stream) ++boolean SubbandLayer2Stereo::read_sampledata (Ibitstream *stream) + { +- bool returnvalue = SubbandLayer2::read_sampledata (stream); ++ boolean returnvalue = SubbandLayer2::read_sampledata (stream); + + if (channel2_allocation) + if (channel2_groupingtable) +@@ -919,10 +919,10 @@ bool SubbandLayer2Stereo::read_sampledat + } + + +-bool SubbandLayer2Stereo::put_next_sample (e_channels channels, ++boolean SubbandLayer2Stereo::put_next_sample (e_channels channels, + SynthesisFilter *filter1, SynthesisFilter *filter2) + { +- bool returnvalue = SubbandLayer2::put_next_sample (channels, filter1, filter2); ++ boolean returnvalue = SubbandLayer2::put_next_sample (channels, filter1, filter2); + if (channel2_allocation && channels != left) + { + register real sample = channel2_samples[samplenumber - 1]; diff --git a/audio/maplay/files/patch-subband__layer__2.h b/audio/maplay/files/patch-subband__layer__2.h new file mode 100644 index 000000000000..b1ee79319de7 --- /dev/null +++ b/audio/maplay/files/patch-subband__layer__2.h @@ -0,0 +1,47 @@ +--- subband_layer_2.h.orig 1994-06-23 12:14:40 UTC ++++ subband_layer_2.h +@@ -55,8 +55,8 @@ public: + void read_allocation (Ibitstream *, Header *, Crc16 *); + virtual void read_scalefactor_selection (Ibitstream *, Crc16 *); + void read_scalefactor (Ibitstream *, Header *); +- bool read_sampledata (Ibitstream *); +- bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter * = NULL); ++ boolean read_sampledata (Ibitstream *); ++ boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter * = NULL); + }; + + +@@ -75,11 +75,11 @@ public: + } + void read_scalefactor_selection (Ibitstream *, Crc16 *); + void read_scalefactor (Ibitstream *, Header *); +- bool read_sampledata (Ibitstream *stream) ++ boolean read_sampledata (Ibitstream *stream) + { + return SubbandLayer2::read_sampledata (stream); + } +- bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); ++ boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); + }; + + +@@ -90,7 +90,7 @@ protected: + uint32 channel2_allocation; + uint32 channel2_scfsi; + real channel2_scalefactor1, channel2_scalefactor2, channel2_scalefactor3; +- bool channel2_grouping; ++ boolean channel2_grouping; + uint32 channel2_codelength; + const real *channel2_groupingtable; + real channel2_factor; +@@ -102,8 +102,8 @@ public: + void read_allocation (Ibitstream *, Header *, Crc16 *); + void read_scalefactor_selection (Ibitstream *, Crc16 *); + void read_scalefactor (Ibitstream *, Header *); +- bool read_sampledata (Ibitstream *); +- bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); ++ boolean read_sampledata (Ibitstream *); ++ boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); + }; + + #endif diff --git a/audio/maplay/files/patch-subband_layer_1.h b/audio/maplay/files/patch-subband_layer_1.h deleted file mode 100644 index d92c2f421598..000000000000 --- a/audio/maplay/files/patch-subband_layer_1.h +++ /dev/null @@ -1,65 +0,0 @@ -*** subband_layer_1.h.orig Thu Jun 23 21:14:40 1994 ---- subband_layer_1.h Thu Dec 9 05:32:19 1999 -*************** -*** 42,49 **** - SubbandLayer1 (uint32 subbandnumber); - void read_allocation (Ibitstream *, Header *, Crc16 *); - void read_scalefactor (Ibitstream *, Header *); -! bool read_sampledata (Ibitstream *); -! bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); - }; - - ---- 42,49 ---- - SubbandLayer1 (uint32 subbandnumber); - void read_allocation (Ibitstream *, Header *, Crc16 *); - void read_scalefactor (Ibitstream *, Header *); -! boolean read_sampledata (Ibitstream *); -! boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); - }; - - -*************** -*** 60,70 **** - SubbandLayer1::read_allocation (stream, header, crc); - } - void read_scalefactor (Ibitstream *, Header *); -! bool read_sampledata (Ibitstream *stream) - { - return SubbandLayer1::read_sampledata (stream); - } -! bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); - }; - - ---- 60,70 ---- - SubbandLayer1::read_allocation (stream, header, crc); - } - void read_scalefactor (Ibitstream *, Header *); -! boolean read_sampledata (Ibitstream *stream) - { - return SubbandLayer1::read_sampledata (stream); - } -! boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); - }; - - -*************** -*** 82,89 **** - SubbandLayer1Stereo (uint32 subbandnumber); - void read_allocation (Ibitstream *, Header *, Crc16 *); - void read_scalefactor (Ibitstream *, Header *); -! bool read_sampledata (Ibitstream *); -! bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); - }; - - #endif ---- 82,89 ---- - SubbandLayer1Stereo (uint32 subbandnumber); - void read_allocation (Ibitstream *, Header *, Crc16 *); - void read_scalefactor (Ibitstream *, Header *); -! boolean read_sampledata (Ibitstream *); -! boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); - }; - - #endif diff --git a/audio/maplay/files/patch-subband_layer_2.cc b/audio/maplay/files/patch-subband_layer_2.cc deleted file mode 100644 index b30d8ad479a6..000000000000 --- a/audio/maplay/files/patch-subband_layer_2.cc +++ /dev/null @@ -1,97 +0,0 @@ -*** subband_layer_2.cc.orig Thu Jun 23 21:14:36 1994 ---- subband_layer_2.cc Thu Dec 9 05:32:19 1999 -*************** -*** 591,597 **** - } - - -! bool SubbandLayer2::read_sampledata (Ibitstream *stream) - { - if (allocation) - if (groupingtable) ---- 591,597 ---- - } - - -! boolean SubbandLayer2::read_sampledata (Ibitstream *stream) - { - if (allocation) - if (groupingtable) -*************** -*** 633,639 **** - } - - -! bool SubbandLayer2::put_next_sample (e_channels channels, - SynthesisFilter *filter1, SynthesisFilter *) - { - #ifdef DEBUG ---- 633,639 ---- - } - - -! boolean SubbandLayer2::put_next_sample (e_channels channels, - SynthesisFilter *filter1, SynthesisFilter *) - { - #ifdef DEBUG -*************** -*** 726,732 **** - } - - -! bool SubbandLayer2IntensityStereo::put_next_sample (e_channels channels, - SynthesisFilter *filter1, SynthesisFilter *filter2) - { - #ifdef DEBUG ---- 726,732 ---- - } - - -! boolean SubbandLayer2IntensityStereo::put_next_sample (e_channels channels, - SynthesisFilter *filter1, SynthesisFilter *filter2) - { - #ifdef DEBUG -*************** -*** 880,888 **** - } - - -! bool SubbandLayer2Stereo::read_sampledata (Ibitstream *stream) - { -! bool returnvalue = SubbandLayer2::read_sampledata (stream); - - if (channel2_allocation) - if (channel2_groupingtable) ---- 880,888 ---- - } - - -! boolean SubbandLayer2Stereo::read_sampledata (Ibitstream *stream) - { -! boolean returnvalue = SubbandLayer2::read_sampledata (stream); - - if (channel2_allocation) - if (channel2_groupingtable) -*************** -*** 919,928 **** - } - - -! bool SubbandLayer2Stereo::put_next_sample (e_channels channels, - SynthesisFilter *filter1, SynthesisFilter *filter2) - { -! bool returnvalue = SubbandLayer2::put_next_sample (channels, filter1, filter2); - if (channel2_allocation && channels != left) - { - register real sample = channel2_samples[samplenumber - 1]; ---- 919,928 ---- - } - - -! boolean SubbandLayer2Stereo::put_next_sample (e_channels channels, - SynthesisFilter *filter1, SynthesisFilter *filter2) - { -! boolean returnvalue = SubbandLayer2::put_next_sample (channels, filter1, filter2); - if (channel2_allocation && channels != left) - { - register real sample = channel2_samples[samplenumber - 1]; diff --git a/audio/maplay/files/patch-subband_layer_2.h b/audio/maplay/files/patch-subband_layer_2.h deleted file mode 100644 index 313ab9b2c1fb..000000000000 --- a/audio/maplay/files/patch-subband_layer_2.h +++ /dev/null @@ -1,82 +0,0 @@ -*** subband_layer_2.h.orig Thu Jun 23 21:14:40 1994 ---- subband_layer_2.h Thu Dec 9 05:32:19 1999 -*************** -*** 55,62 **** - void read_allocation (Ibitstream *, Header *, Crc16 *); - virtual void read_scalefactor_selection (Ibitstream *, Crc16 *); - void read_scalefactor (Ibitstream *, Header *); -! bool read_sampledata (Ibitstream *); -! bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter * = NULL); - }; - - ---- 55,62 ---- - void read_allocation (Ibitstream *, Header *, Crc16 *); - virtual void read_scalefactor_selection (Ibitstream *, Crc16 *); - void read_scalefactor (Ibitstream *, Header *); -! boolean read_sampledata (Ibitstream *); -! boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter * = NULL); - }; - - -*************** -*** 75,85 **** - } - void read_scalefactor_selection (Ibitstream *, Crc16 *); - void read_scalefactor (Ibitstream *, Header *); -! bool read_sampledata (Ibitstream *stream) - { - return SubbandLayer2::read_sampledata (stream); - } -! bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); - }; - - ---- 75,85 ---- - } - void read_scalefactor_selection (Ibitstream *, Crc16 *); - void read_scalefactor (Ibitstream *, Header *); -! boolean read_sampledata (Ibitstream *stream) - { - return SubbandLayer2::read_sampledata (stream); - } -! boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); - }; - - -*************** -*** 90,96 **** - uint32 channel2_allocation; - uint32 channel2_scfsi; - real channel2_scalefactor1, channel2_scalefactor2, channel2_scalefactor3; -! bool channel2_grouping; - uint32 channel2_codelength; - const real *channel2_groupingtable; - real channel2_factor; ---- 90,96 ---- - uint32 channel2_allocation; - uint32 channel2_scfsi; - real channel2_scalefactor1, channel2_scalefactor2, channel2_scalefactor3; -! boolean channel2_grouping; - uint32 channel2_codelength; - const real *channel2_groupingtable; - real channel2_factor; -*************** -*** 102,109 **** - void read_allocation (Ibitstream *, Header *, Crc16 *); - void read_scalefactor_selection (Ibitstream *, Crc16 *); - void read_scalefactor (Ibitstream *, Header *); -! bool read_sampledata (Ibitstream *); -! bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); - }; - - #endif ---- 102,109 ---- - void read_allocation (Ibitstream *, Header *, Crc16 *); - void read_scalefactor_selection (Ibitstream *, Crc16 *); - void read_scalefactor (Ibitstream *, Header *); -! boolean read_sampledata (Ibitstream *); -! boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); - }; - - #endif diff --git a/audio/maplay/files/patch-synthesis_filter.h b/audio/maplay/files/patch-synthesis__filter.h similarity index 61% rename from audio/maplay/files/patch-synthesis_filter.h rename to audio/maplay/files/patch-synthesis__filter.h index c1b8c8599468..652fe31d9165 100644 --- a/audio/maplay/files/patch-synthesis_filter.h +++ b/audio/maplay/files/patch-synthesis__filter.h @@ -1,5 +1,5 @@ ---- synthesis_filter.h.orig Thu Nov 21 16:36:03 2002 -+++ synthesis_filter.h Thu Nov 21 16:36:10 2002 +--- synthesis_filter.h.orig 1994-06-23 12:14:40 UTC ++++ synthesis_filter.h @@ -21,7 +21,7 @@ #ifndef SYNTHESIS_FILTER_H #define SYNTHESIS_FILTER_H diff --git a/audio/mcplay/files/patch-Makefile b/audio/mcplay/files/patch-Makefile index dadec7782965..91961e4c703c 100644 --- a/audio/mcplay/files/patch-Makefile +++ b/audio/mcplay/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2002-04-28 06:30:35.000000000 -0700 -+++ Makefile 2010-03-19 11:07:59.000000000 -0700 -@@ -13,7 +13,7 @@ +--- Makefile.orig 2002-04-28 13:30:35 UTC ++++ Makefile +@@ -13,7 +13,7 @@ OGG_CFLAGS=-DHAVE_OGG123 SOX_CFLAGS=-DHAVE_SOX #uncomment _one_ of these for midi support @@ -9,7 +9,7 @@ #MID_CFLAGS=-DHAVE_PLAYMIDI #uncomment these two lines if you have lirc -@@ -24,7 +24,7 @@ +@@ -24,7 +24,7 @@ MID_CFLAGS=-DHAVE_DRVMIDI #LOG_CFLAGS=-DLOG_DIR_S=\"/tmp\" #set install dirs here @@ -18,7 +18,7 @@ BINDIR=$(INSTDIR)/bin ##################################################################### -@@ -33,7 +33,7 @@ +@@ -33,7 +33,7 @@ BINDIR=$(INSTDIR)/bin PROGNAME=mcplay VERSION=0.3i DISTDIR=$(PROGNAME)-$(VERSION) @@ -27,7 +27,7 @@ TARGET=mcplay OBJECTS=mcplay.o \ screen.o \ -@@ -48,7 +48,7 @@ +@@ -48,7 +48,7 @@ OBJECTS=mcplay.o \ DATA=Makefile COPYING @@ -36,7 +36,7 @@ MY_LFLAGS= PLAYER_CFLAGS=$(MPG_CFLAGS) $(OGG_CFLAGS) $(SOX_CFLAGS) $(MID_CFLAGS) -@@ -60,7 +60,7 @@ +@@ -60,7 +60,7 @@ GLIB_LFLAGS=`glib-config --libs` NCURSES_CFLAGS= NCURSES_LFLAGS=-lncurses diff --git a/audio/mcplay/files/patch-config.h b/audio/mcplay/files/patch-config.h index 0998714164a8..ca194f078485 100644 --- a/audio/mcplay/files/patch-config.h +++ b/audio/mcplay/files/patch-config.h @@ -1,5 +1,5 @@ ---- config.h.orig 2010-03-18 18:48:31.000000000 -0700 -+++ config.h 2010-03-18 18:50:27.000000000 -0700 +--- config.h.orig 2002-04-28 13:30:35 UTC ++++ config.h @@ -26,7 +26,7 @@ #define LOGFILE_S LOGDIR_S""G_DIR_SEPARATOR_S""PROGNAME_S".log" diff --git a/audio/mcplay/files/patch-mixer.c b/audio/mcplay/files/patch-mixer.c index 11cf95d42422..30c695988f0c 100644 --- a/audio/mcplay/files/patch-mixer.c +++ b/audio/mcplay/files/patch-mixer.c @@ -1,5 +1,5 @@ ---- mixer.c.orig 2010-03-18 18:58:51.000000000 -0700 -+++ mixer.c 2010-03-18 18:59:10.000000000 -0700 +--- mixer.c.orig 2002-04-28 13:30:35 UTC ++++ mixer.c @@ -7,7 +7,7 @@ #include #include diff --git a/audio/mcplay/files/patch-screen.c b/audio/mcplay/files/patch-screen.c index 1f2b07a71c6a..9b84f4a9cbd7 100644 --- a/audio/mcplay/files/patch-screen.c +++ b/audio/mcplay/files/patch-screen.c @@ -1,6 +1,6 @@ ---- screen.c.orig 2010-03-18 19:50:01.000000000 -0700 -+++ screen.c 2010-03-18 19:54:07.000000000 -0700 -@@ -275,9 +275,13 @@ +--- screen.c.orig 2002-04-28 13:30:35 UTC ++++ screen.c +@@ -275,9 +275,13 @@ void screen_message( ScreenData *data, g gchar *tmp, *str; va_start(az, fmt); diff --git a/audio/milkytracker/files/patch-src__tracker__TrackerStartUp.cpp b/audio/milkytracker/files/patch-src_tracker_TrackerStartUp.cpp similarity index 83% rename from audio/milkytracker/files/patch-src__tracker__TrackerStartUp.cpp rename to audio/milkytracker/files/patch-src_tracker_TrackerStartUp.cpp index 2bc37e7da334..deb1346b297e 100644 --- a/audio/milkytracker/files/patch-src__tracker__TrackerStartUp.cpp +++ b/audio/milkytracker/files/patch-src_tracker_TrackerStartUp.cpp @@ -1,5 +1,5 @@ ---- src/tracker/TrackerStartUp.cpp.orig 2013-11-09 01:12:01.000000000 +0100 -+++ src/tracker/TrackerStartUp.cpp 2016-04-03 21:14:18.976681000 +0200 +--- src/tracker/TrackerStartUp.cpp.orig 2013-11-09 00:12:01 UTC ++++ src/tracker/TrackerStartUp.cpp @@ -126,7 +126,7 @@ void Tracker::showSplash() screen->paintSplash(LogoBig::rawData, LogoBig::width, LogoBig::height, LogoBig::width*3, 3, (int)shade); #endif diff --git a/audio/minitunes/files/patch-src-collectionscanner.h b/audio/minitunes/files/patch-src_collectionscanner.h similarity index 55% rename from audio/minitunes/files/patch-src-collectionscanner.h rename to audio/minitunes/files/patch-src_collectionscanner.h index 443a2568e2c8..e4b6ce5a1b70 100644 --- a/audio/minitunes/files/patch-src-collectionscanner.h +++ b/audio/minitunes/files/patch-src_collectionscanner.h @@ -1,5 +1,5 @@ ---- src/collectionscanner.h.orig 2010-07-05 18:02:28.000000000 +0800 -+++ src/collectionscanner.h 2010-07-06 16:08:43.000000000 +0800 +--- src/collectionscanner.h.orig 2010-07-13 10:30:19 UTC ++++ src/collectionscanner.h @@ -6,8 +6,8 @@ #include "model/album.h" diff --git a/audio/minitunes/files/patch-src_qtsingleapplication_qtlocalpeer.cpp b/audio/minitunes/files/patch-src_qtsingleapplication_qtlocalpeer.cpp index 6c85ff0415fd..ebc0830d30d9 100644 --- a/audio/minitunes/files/patch-src_qtsingleapplication_qtlocalpeer.cpp +++ b/audio/minitunes/files/patch-src_qtsingleapplication_qtlocalpeer.cpp @@ -1,4 +1,4 @@ ---- src/qtsingleapplication/qtlocalpeer.cpp.orig 2010-07-13 10:30:19.000000000 +0000 +--- src/qtsingleapplication/qtlocalpeer.cpp.orig 2010-07-13 10:30:19 UTC +++ src/qtsingleapplication/qtlocalpeer.cpp @@ -56,6 +56,7 @@ typedef BOOL(WINAPI*PProcessIdToSessionI static PProcessIdToSessionId pProcessIdToSessionId = 0; diff --git a/audio/mixer.app/files/patch-Mixer.cc b/audio/mixer.app/files/patch-Mixer.cc index 8f1e32f14cb4..371baac8fb35 100644 --- a/audio/mixer.app/files/patch-Mixer.cc +++ b/audio/mixer.app/files/patch-Mixer.cc @@ -1,5 +1,5 @@ ---- Mixer.cc.orig Sun Sep 15 18:42:33 2002 -+++ Mixer.cc Tue Apr 29 01:43:01 2003 +--- Mixer.cc.orig 2002-09-15 16:42:33 UTC ++++ Mixer.cc @@ -33,8 +33,6 @@ #if defined(__Linux__) diff --git a/audio/mixmos/files/patch-src__mixer.h b/audio/mixmos/files/patch-src_mixer.h similarity index 70% rename from audio/mixmos/files/patch-src__mixer.h rename to audio/mixmos/files/patch-src_mixer.h index da743376a0cb..c2c6a585e223 100644 --- a/audio/mixmos/files/patch-src__mixer.h +++ b/audio/mixmos/files/patch-src_mixer.h @@ -1,5 +1,5 @@ ---- src/mixer.h.orig Sat Jul 24 13:16:52 2004 -+++ src/mixer.h Sat Jul 24 13:17:30 2004 +--- src/mixer.h.orig 2003-12-14 18:23:19 UTC ++++ src/mixer.h @@ -23,7 +23,7 @@ #include #include diff --git a/audio/mixmos/files/patch-src__prefs.h b/audio/mixmos/files/patch-src_prefs.h similarity index 58% rename from audio/mixmos/files/patch-src__prefs.h rename to audio/mixmos/files/patch-src_prefs.h index 70d41b2d7333..c455262f2f23 100644 --- a/audio/mixmos/files/patch-src__prefs.h +++ b/audio/mixmos/files/patch-src_prefs.h @@ -1,5 +1,5 @@ ---- src/prefs.h.orig Sat Jul 24 13:17:03 2004 -+++ src/prefs.h Sat Jul 24 13:17:16 2004 +--- src/prefs.h.orig 2003-12-14 18:23:19 UTC ++++ src/prefs.h @@ -20,7 +20,7 @@ */ diff --git a/audio/mixxx/files/patch-build__depends.py b/audio/mixxx/files/patch-build_depends.py similarity index 93% rename from audio/mixxx/files/patch-build__depends.py rename to audio/mixxx/files/patch-build_depends.py index e638fe61a289..2125e9f8771e 100644 --- a/audio/mixxx/files/patch-build__depends.py +++ b/audio/mixxx/files/patch-build_depends.py @@ -1,6 +1,6 @@ ---- build/depends.py.orig 2012-01-16 06:02:51.000000000 +0900 -+++ build/depends.py 2012-01-16 06:04:08.000000000 +0900 -@@ -150,7 +150,7 @@ +--- build/depends.py.orig 2013-05-08 23:20:26 UTC ++++ build/depends.py +@@ -150,7 +150,7 @@ class FLAC(Dependence): class Qt(Dependence): DEFAULT_QTDIRS = {'linux': '/usr/share/qt4', @@ -9,7 +9,7 @@ 'osx': '/Library/Frameworks', 'windows': 'C:\\qt\\4.6.0'} -@@ -219,6 +219,7 @@ +@@ -219,6 +219,7 @@ class Qt(Dependence): build.env.Append(LIBS = 'QtOpenGL') build.env.Append(LIBS = 'QtXml') build.env.Append(LIBS = 'QtNetwork') @@ -17,7 +17,7 @@ build.env.Append(LIBS = 'QtScript') if use_qtwebkit: build.env.Append(LIBS = 'QtWebKit') -@@ -264,16 +265,16 @@ +@@ -264,16 +265,16 @@ class Qt(Dependence): # Set Qt include paths for non-OSX if not build.platform_is_osx: @@ -43,7 +43,7 @@ build.env.Append(CPPPATH=include_paths) # Set the rpath for linux/bsd/osx. -@@ -387,7 +388,7 @@ +@@ -387,7 +388,7 @@ class TagLib(Dependence): # the files correctly. Adding this folder ot the include path should fix # it, though might cause issues. This is safe to remove once we # deprecate Karmic support. rryan 2/2011 @@ -52,7 +52,7 @@ if build.platform_is_windows and build.static_dependencies: build.env.Append(CPPDEFINES = 'TAGLIB_STATIC') -@@ -782,14 +783,9 @@ +@@ -782,14 +783,9 @@ class MixxxCore(Feature): if build.toolchain_is_gnu: # Default GNU Options # TODO(XXX) always generate debugging info? @@ -67,7 +67,7 @@ elif build.toolchain_is_msvs: # Validate the specified winlib directory exists mixxx_lib_path = SCons.ARGUMENTS.get('winlib', '..\\..\\..\\mixxx-win32lib-msvc100-release') -@@ -851,16 +847,19 @@ +@@ -851,16 +847,19 @@ class MixxxCore(Feature): elif build.platform_is_bsd: build.env.Append(CPPDEFINES='__BSD__') @@ -94,7 +94,7 @@ # Define for things that would like to special case UNIX (Linux or BSD) if build.platform_is_bsd or build.platform_is_linux: -@@ -897,14 +896,14 @@ +@@ -897,14 +896,14 @@ class MixxxCore(Feature): # Say where to find resources on Unix. TODO(XXX) replace this with a # RESOURCE_PATH that covers Win and OSX too: if build.platform_is_linux or build.platform_is_bsd: diff --git a/audio/mixxx/files/patch-build__features.py b/audio/mixxx/files/patch-build_features.py similarity index 93% rename from audio/mixxx/files/patch-build__features.py rename to audio/mixxx/files/patch-build_features.py index 262fe600e5c7..e86985c496d3 100644 --- a/audio/mixxx/files/patch-build__features.py +++ b/audio/mixxx/files/patch-build_features.py @@ -1,6 +1,6 @@ ---- build/features.py.orig +--- build/features.py.orig 2013-05-08 23:20:26 UTC +++ build/features.py -@@ -83,6 +83,9 @@ +@@ -83,6 +83,9 @@ class HID(Feature): elif build.platform_is_osx: build.env.Append(LINKFLAGS='-framework IOKit') build.env.Append(LINKFLAGS='-framework CoreFoundation') @@ -10,7 +10,7 @@ build.env.Append(CPPDEFINES = '__HID__') -@@ -95,7 +98,7 @@ +@@ -95,7 +98,7 @@ class HID(Feature): # Requires setupapi.lib which is included by the above check for # setupapi. sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, "windows/hid.c")) @@ -19,7 +19,7 @@ sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, 'linux/hid-libusb.c')) elif build.platform_is_osx: sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, 'mac/hid.c')) -@@ -108,24 +111,27 @@ +@@ -108,24 +111,27 @@ class Bulk(Feature): def enabled(self, build): # For now only make Bulk default on Linux only. Turn on for all # platforms after the 1.11.0 release. diff --git a/audio/mixxx/files/patch-build__qt4.py b/audio/mixxx/files/patch-build_qt4.py similarity index 80% rename from audio/mixxx/files/patch-build__qt4.py rename to audio/mixxx/files/patch-build_qt4.py index e19f9b9b3630..2a3ccd22bce1 100644 --- a/audio/mixxx/files/patch-build__qt4.py +++ b/audio/mixxx/files/patch-build_qt4.py @@ -1,6 +1,6 @@ ---- build/qt4.py.orig 2011-12-24 11:53:19.000000000 +0900 -+++ build/qt4.py 2012-01-16 06:10:09.000000000 +0900 -@@ -245,8 +245,8 @@ +--- build/qt4.py.orig 2013-05-08 23:20:26 UTC ++++ build/qt4.py +@@ -246,8 +246,8 @@ def generate(env): env.Replace( # QTDIR = _detect(env), QT4_BINPATH = os.path.join('$QTDIR', 'bin'), diff --git a/audio/mixxx/files/patch-lib__hidapi-0.8.0-pre__linux__hid-libusb.c b/audio/mixxx/files/patch-lib_hidapi-0.8.0-pre_linux_hid-libusb.c similarity index 79% rename from audio/mixxx/files/patch-lib__hidapi-0.8.0-pre__linux__hid-libusb.c rename to audio/mixxx/files/patch-lib_hidapi-0.8.0-pre_linux_hid-libusb.c index 98d89c21be99..9ef29ab1275b 100644 --- a/audio/mixxx/files/patch-lib__hidapi-0.8.0-pre__linux__hid-libusb.c +++ b/audio/mixxx/files/patch-lib_hidapi-0.8.0-pre_linux_hid-libusb.c @@ -1,4 +1,4 @@ ---- lib/hidapi-0.8.0-pre/linux/hid-libusb.c.orig +--- lib/hidapi-0.8.0-pre/linux/hid-libusb.c.orig 2013-05-08 23:20:26 UTC +++ lib/hidapi-0.8.0-pre/linux/hid-libusb.c @@ -48,6 +48,12 @@ @@ -13,7 +13,7 @@ #ifdef __cplusplus extern "C" { #endif -@@ -264,7 +270,7 @@ +@@ -264,7 +270,7 @@ static uint16_t get_first_language(libus int len; /* Get the string from libusb. */ @@ -22,7 +22,7 @@ 0x0, /* String ID */ 0x0, /* Language */ (unsigned char*)buf, -@@ -282,7 +288,7 @@ +@@ -282,7 +288,7 @@ static int is_language_supported(libusb_ int i; /* Get the string from libusb. */ @@ -31,7 +31,7 @@ 0x0, /* String ID */ 0x0, /* Language */ (unsigned char*)buf, -@@ -327,7 +333,7 @@ +@@ -327,7 +333,7 @@ static wchar_t *get_usb_string(libusb_de lang = get_first_language(dev); /* Get the string from libusb. */ diff --git a/audio/mixxx/files/patch-src__controllers__controllermanager.cpp b/audio/mixxx/files/patch-src_controllers_controllermanager.cpp similarity index 81% rename from audio/mixxx/files/patch-src__controllers__controllermanager.cpp rename to audio/mixxx/files/patch-src_controllers_controllermanager.cpp index ca6f652786c3..be14f60d1d0e 100644 --- a/audio/mixxx/files/patch-src__controllers__controllermanager.cpp +++ b/audio/mixxx/files/patch-src_controllers_controllermanager.cpp @@ -1,4 +1,4 @@ ---- src/controllers/controllermanager.cpp.orig +--- src/controllers/controllermanager.cpp.orig 2013-05-08 23:20:26 UTC +++ src/controllers/controllermanager.cpp @@ -12,7 +12,10 @@ #include "controllers/defs_controllers.h" @@ -11,7 +11,7 @@ #ifdef __HSS1394__ #include "controllers/midi/hss1394enumerator.h" #endif -@@ -78,7 +81,9 @@ +@@ -78,7 +81,9 @@ ControllerManager::ControllerManager(Con m_pPresetInfoManager = new PresetInfoEnumerator(m_pConfig); // Instantiate all enumerators diff --git a/audio/mixxx/files/patch-src__defs.h b/audio/mixxx/files/patch-src_defs.h similarity index 56% rename from audio/mixxx/files/patch-src__defs.h rename to audio/mixxx/files/patch-src_defs.h index d15e24eabc9d..04ef41da2eb8 100644 --- a/audio/mixxx/files/patch-src__defs.h +++ b/audio/mixxx/files/patch-src_defs.h @@ -1,6 +1,6 @@ ---- src/defs.h.orig +--- src/defs.h.orig 2013-05-08 23:20:26 UTC +++ src/defs.h -@@ -87,6 +87,8 @@ +@@ -87,6 +87,8 @@ inline double zap_denormal(double x) #define math_min(a,b) (((a) < (b)) ? (a) : (b)) #endif @@ -9,7 +9,7 @@ // MSVC 2005/2008 needs these #ifndef fmax #define fmax math_max -@@ -98,3 +100,5 @@ +@@ -98,3 +100,5 @@ inline double zap_denormal(double x) #endif diff --git a/audio/mixxx/files/patch-src__recording__encodermp3.cpp b/audio/mixxx/files/patch-src_recording_encodermp3.cpp similarity index 78% rename from audio/mixxx/files/patch-src__recording__encodermp3.cpp rename to audio/mixxx/files/patch-src_recording_encodermp3.cpp index 8ce01c4d4ca7..5c4c83fd9b30 100644 --- a/audio/mixxx/files/patch-src__recording__encodermp3.cpp +++ b/audio/mixxx/files/patch-src_recording_encodermp3.cpp @@ -1,6 +1,6 @@ ---- src/recording/encodermp3.cpp.orig 2012-06-26 05:23:37.000000000 +0900 -+++ src/recording/encodermp3.cpp 2012-08-09 09:06:21.000000000 +0900 -@@ -85,7 +85,7 @@ +--- src/recording/encodermp3.cpp.orig 2013-05-08 23:20:26 UTC ++++ src/recording/encodermp3.cpp +@@ -85,7 +85,7 @@ EncoderMp3::EncoderMp3(EngineAbstractRec */ QStringList libnames; QString libname = ""; @@ -9,7 +9,7 @@ libnames << "mp3lame"; #elif __WINDOWS__ libnames << "lame_enc.dll"; -@@ -108,7 +108,7 @@ +@@ -108,7 +108,7 @@ EncoderMp3::EncoderMp3(EngineAbstractRec props->setType(DLG_WARNING); props->setTitle(tr("Encoder")); QString key = ""; diff --git a/audio/mixxx/files/patch-src__sounddeviceportaudio.cpp b/audio/mixxx/files/patch-src_sounddeviceportaudio.cpp similarity index 73% rename from audio/mixxx/files/patch-src__sounddeviceportaudio.cpp rename to audio/mixxx/files/patch-src_sounddeviceportaudio.cpp index 802c2b3a8a23..ff34f62cef20 100644 --- a/audio/mixxx/files/patch-src__sounddeviceportaudio.cpp +++ b/audio/mixxx/files/patch-src_sounddeviceportaudio.cpp @@ -1,6 +1,6 @@ ---- src/sounddeviceportaudio.cpp.orig 2011-12-24 11:53:20.000000000 +0900 -+++ src/sounddeviceportaudio.cpp 2012-01-16 06:10:09.000000000 +0900 -@@ -182,10 +182,10 @@ +--- src/sounddeviceportaudio.cpp.orig 2013-05-08 23:20:26 UTC ++++ src/sounddeviceportaudio.cpp +@@ -182,10 +182,10 @@ int SoundDevicePortAudio::open() qDebug() << "Opened PortAudio stream successfully... starting"; } diff --git a/audio/mixxx/files/patch-src__soundmanager.cpp b/audio/mixxx/files/patch-src_soundmanager.cpp similarity index 75% rename from audio/mixxx/files/patch-src__soundmanager.cpp rename to audio/mixxx/files/patch-src_soundmanager.cpp index 546f5462f65d..626f63cb0d0b 100644 --- a/audio/mixxx/files/patch-src__soundmanager.cpp +++ b/audio/mixxx/files/patch-src_soundmanager.cpp @@ -1,6 +1,6 @@ ---- src/soundmanager.cpp.orig 2011-12-24 11:53:20.000000000 +0900 -+++ src/soundmanager.cpp 2012-01-16 06:10:09.000000000 +0900 -@@ -309,7 +309,7 @@ +--- src/soundmanager.cpp.orig 2013-05-08 23:20:26 UTC ++++ src/soundmanager.cpp +@@ -234,7 +234,7 @@ void SoundManager::queryDevices() { #ifdef __PORTAUDIO__ PaError err = paNoError; if (!m_paInitialized) { @@ -9,7 +9,7 @@ setJACKName(); #endif err = Pa_Initialize(); -@@ -702,9 +702,9 @@ +@@ -626,9 +626,9 @@ QList SoundManager::register void SoundManager::setJACKName() const { #ifdef __PORTAUDIO__ diff --git a/audio/mixxx/files/patch-src__soundmanagerconfig.cpp b/audio/mixxx/files/patch-src_soundmanagerconfig.cpp similarity index 71% rename from audio/mixxx/files/patch-src__soundmanagerconfig.cpp rename to audio/mixxx/files/patch-src_soundmanagerconfig.cpp index 0f5246c41040..3eb0c22cfdd8 100644 --- a/audio/mixxx/files/patch-src__soundmanagerconfig.cpp +++ b/audio/mixxx/files/patch-src_soundmanagerconfig.cpp @@ -1,6 +1,6 @@ ---- src/soundmanagerconfig.cpp.orig 2011-12-24 11:53:20.000000000 +0900 -+++ src/soundmanagerconfig.cpp 2012-01-16 06:10:09.000000000 +0900 -@@ -290,7 +290,7 @@ +--- src/soundmanagerconfig.cpp.orig 2013-05-08 23:20:26 UTC ++++ src/soundmanagerconfig.cpp +@@ -290,7 +290,7 @@ void SoundManagerConfig::loadDefaults(So if (flags & SoundManagerConfig::API) { QList apiList = soundManager->getHostAPIList(); if (!apiList.isEmpty()) { diff --git a/audio/mixxx/files/patch-src__soundsourceoggvorbis.cpp b/audio/mixxx/files/patch-src_soundsourceoggvorbis.cpp similarity index 64% rename from audio/mixxx/files/patch-src__soundsourceoggvorbis.cpp rename to audio/mixxx/files/patch-src_soundsourceoggvorbis.cpp index 89ee7978514a..5e3d66439f1b 100644 --- a/audio/mixxx/files/patch-src__soundsourceoggvorbis.cpp +++ b/audio/mixxx/files/patch-src_soundsourceoggvorbis.cpp @@ -1,5 +1,5 @@ ---- src/soundsourceoggvorbis.cpp.orig 2011-12-24 11:53:20.000000000 +0900 -+++ src/soundsourceoggvorbis.cpp 2012-01-16 06:10:09.000000000 +0900 +--- src/soundsourceoggvorbis.cpp.orig 2013-05-08 23:20:26 UTC ++++ src/soundsourceoggvorbis.cpp @@ -32,6 +32,15 @@ #endif #endif diff --git a/audio/mixxx/files/patch-src__soundsourceproxy.cpp b/audio/mixxx/files/patch-src_soundsourceproxy.cpp similarity index 68% rename from audio/mixxx/files/patch-src__soundsourceproxy.cpp rename to audio/mixxx/files/patch-src_soundsourceproxy.cpp index 8809f02491dc..56423ca4d62b 100644 --- a/audio/mixxx/files/patch-src__soundsourceproxy.cpp +++ b/audio/mixxx/files/patch-src_soundsourceproxy.cpp @@ -1,6 +1,6 @@ ---- src/soundsourceproxy.cpp.orig 2011-12-24 11:53:20.000000000 +0900 -+++ src/soundsourceproxy.cpp 2012-01-16 06:10:09.000000000 +0900 -@@ -84,7 +84,7 @@ +--- src/soundsourceproxy.cpp.orig 2013-05-08 23:20:26 UTC ++++ src/soundsourceproxy.cpp +@@ -84,7 +84,7 @@ void SoundSourceProxy::loadPlugins() qDebug() << "Adding plugin path from commandline arg:" << pluginPath; pluginDirs.append(QDir(pluginPath)); } diff --git a/audio/modplugplay/files/patch-modplugplay.c b/audio/modplugplay/files/patch-modplugplay.c index 42dd02e0164b..d0f512993a38 100644 --- a/audio/modplugplay/files/patch-modplugplay.c +++ b/audio/modplugplay/files/patch-modplugplay.c @@ -1,5 +1,5 @@ ---- modplugplay.c.orig Mon Oct 6 09:33:56 2003 -+++ modplugplay.c Thu Feb 5 20:40:53 2004 +--- modplugplay.c.orig 2003-10-06 07:33:56 UTC ++++ modplugplay.c @@ -1,8 +1,7 @@ - /* @@ -10,7 +10,7 @@ TODO unlock /dev/dsp when in 'p'ause mode -@@ -151,7 +150,7 @@ +@@ -151,7 +150,7 @@ void ansi_cursor(int visible) void help(char *s) { @@ -19,7 +19,7 @@ printf("Version %s compiled on %s at %s.\n",VERSION,__DATE__,__TIME__); printf("\n"); printf("%s: too few arguments\n",s); -@@ -183,10 +182,10 @@ +@@ -183,10 +182,10 @@ int get_byteorder(void) char t[sz]; int i, lit, big; @@ -32,7 +32,7 @@ char c = ival&0xff; ival >>= 8; if (s[i] == c) lit++; -@@ -250,6 +249,7 @@ +@@ -250,6 +249,7 @@ int setrelpcmvol(int newvol) } ioctl(mixer_fd,MIXER_WRITE(SOUND_MIXER_PCM),&newvol); close(mixer_fd); @@ -40,7 +40,7 @@ } int main(int argc, char* argv[]) -@@ -257,7 +257,7 @@ +@@ -257,7 +257,7 @@ int main(int argc, char* argv[]) FILE *f; long size; char *d; @@ -49,7 +49,7 @@ ModPlugFile *f2; int len,mlen; struct timeval tvstart; -@@ -269,8 +269,11 @@ +@@ -269,8 +269,11 @@ int main(int argc, char* argv[]) char songname[41]; char notpaus[4]; @@ -62,7 +62,7 @@ /* struct count_info ci; ioctl(audio_fd,SNDCTL_DSP_GETOPTR,&ci); -@@ -289,7 +292,6 @@ +@@ -289,7 +292,6 @@ int main(int argc, char* argv[]) int channels = 2; int speed = 44100; @@ -70,7 +70,7 @@ char buffer[128]; int result, nread; struct pollfd pollfds; -@@ -299,19 +301,10 @@ +@@ -299,19 +301,10 @@ int main(int argc, char* argv[]) int mono=0; int bits=0; int song; @@ -90,7 +90,7 @@ if (get_byteorder()==0) { format=AFMT_S16_LE; -@@ -335,7 +328,7 @@ +@@ -335,7 +328,7 @@ int main(int argc, char* argv[]) /* if (strstr(argv[1],"-v")) { diff --git a/audio/mous/files/patch-contrib__ffmpeg-strip-wma__common.h b/audio/mous/files/patch-contrib_ffmpeg-strip-wma_common.h similarity index 100% rename from audio/mous/files/patch-contrib__ffmpeg-strip-wma__common.h rename to audio/mous/files/patch-contrib_ffmpeg-strip-wma_common.h diff --git a/audio/mp-player/files/patch-mp.c b/audio/mp-player/files/patch-mp.c index d74b2eaeb994..251a01b0e060 100644 --- a/audio/mp-player/files/patch-mp.c +++ b/audio/mp-player/files/patch-mp.c @@ -1,5 +1,5 @@ ---- mp.c.orig Fri Aug 26 09:59:36 2005 -+++ mp.c Fri Aug 26 09:59:57 2005 +--- mp.c.orig 2004-01-28 21:39:17 UTC ++++ mp.c @@ -27,7 +27,7 @@ #include #include diff --git a/audio/mp32ogg/files/patch-mp32ogg b/audio/mp32ogg/files/patch-mp32ogg index ed119bf22716..0d404b2a8014 100644 --- a/audio/mp32ogg/files/patch-mp32ogg +++ b/audio/mp32ogg/files/patch-mp32ogg @@ -1,6 +1,6 @@ ---- mp32ogg.orig Thu May 9 20:59:03 2002 -+++ mp32ogg Thu May 9 20:59:56 2002 -@@ -89,9 +89,9 @@ +--- mp32ogg.orig 2016-07-26 15:20:33 UTC ++++ mp32ogg +@@ -89,9 +89,9 @@ use String::ShellQuote; use_winamp_genres(); diff --git a/audio/mp3_check/files/patch-Makefile b/audio/mp3_check/files/patch-Makefile index e5016201b723..57a01fd9c7b5 100644 --- a/audio/mp3_check/files/patch-Makefile +++ b/audio/mp3_check/files/patch-Makefile @@ -11,7 +11,7 @@ OBJS = mp3_check.o \ mp3_check_misc.o -@@ -21,7 +21,7 @@ +@@ -21,7 +21,7 @@ trim: $(OBJS) cat MILESTONE.INTRO install: all diff --git a/audio/mp3_check/files/patch-mp3__check.c b/audio/mp3_check/files/patch-mp3__check.c new file mode 100644 index 000000000000..33aba00551ff --- /dev/null +++ b/audio/mp3_check/files/patch-mp3__check.c @@ -0,0 +1,10 @@ +--- mp3_check.c.orig 2000-07-29 06:51:38 UTC ++++ mp3_check.c +@@ -60,6 +60,7 @@ GOALS: Initially, making a higly accura + + #include + #include ++#include + #include + #include + #include diff --git a/audio/mp3_check/files/patch-mp3_check_misc.c b/audio/mp3_check/files/patch-mp3__check__misc.c similarity index 84% rename from audio/mp3_check/files/patch-mp3_check_misc.c rename to audio/mp3_check/files/patch-mp3__check__misc.c index 95af1b4d9306..dbecd40c1de7 100644 --- a/audio/mp3_check/files/patch-mp3_check_misc.c +++ b/audio/mp3_check/files/patch-mp3__check__misc.c @@ -1,5 +1,5 @@ ---- ./mp3_check_misc.c.orig 2000-09-16 05:36:01.000000000 +0200 -+++ ./mp3_check_misc.c 2014-02-14 11:10:48.287957674 +0100 +--- mp3_check_misc.c.orig 2000-09-16 03:36:01 UTC ++++ mp3_check_misc.c @@ -11,7 +11,7 @@ #include "support_functions.h" @@ -9,7 +9,7 @@ int get_char_from_file(FILE *, unsigned int *header_value, gen_info *file_info, command_flags *flags, char *possible_mp3_tag); int scan_file(FILE *, char *filename, meta_options *flag_options, command_flags *flags); int parse_args(char **argv, meta_options *flag_options, command_flags *flags); -@@ -670,7 +670,7 @@ +@@ -670,7 +670,7 @@ parse_args(argv, flag_options, flags) return(PASS); } diff --git a/audio/mp3_check/files/patch-mp3_check.c b/audio/mp3_check/files/patch-mp3_check.c deleted file mode 100644 index 3efd197afdc9..000000000000 --- a/audio/mp3_check/files/patch-mp3_check.c +++ /dev/null @@ -1,10 +0,0 @@ ---- ./mp3_check.c.orig 2000-07-29 08:51:38.000000000 +0200 -+++ ./mp3_check.c 2014-02-14 11:10:48.285958149 +0100 -@@ -60,6 +60,7 @@ - - #include - #include -+#include - #include - #include - #include diff --git a/audio/mp3asm/files/patch-utils.c b/audio/mp3asm/files/patch-src_utils.c similarity index 60% rename from audio/mp3asm/files/patch-utils.c rename to audio/mp3asm/files/patch-src_utils.c index a4be43497def..18e8a989a6d9 100644 --- a/audio/mp3asm/files/patch-utils.c +++ b/audio/mp3asm/files/patch-src_utils.c @@ -1,5 +1,5 @@ ---- src/utils.c.orig Fri Jul 20 11:14:59 2001 -+++ src/utils.c Fri Jul 20 11:15:37 2001 +--- src/utils.c.orig 2001-08-17 20:44:09 UTC ++++ src/utils.c @@ -25,6 +25,7 @@ #include "utils.h" #include diff --git a/audio/mp3blaster/files/patch-src__main.cc b/audio/mp3blaster/files/patch-src__main.cc index ba8b05bb8904..37ac6b1306ef 100644 --- a/audio/mp3blaster/files/patch-src__main.cc +++ b/audio/mp3blaster/files/patch-src__main.cc @@ -1,6 +1,6 @@ ---- src/main.cc.orig Tue Aug 29 08:54:53 2006 -+++ src/main.cc Tue Aug 29 08:55:01 2006 -@@ -5448,7 +5448,7 @@ +--- src/main.cc.orig 2009-01-24 15:25:10 UTC ++++ src/main.cc +@@ -5480,7 +5480,7 @@ main(int argc, char *argv[], char *envp[ { 0, 0, 0, 0} }; diff --git a/audio/mp3info/files/patch-Makefile b/audio/mp3info/files/patch-Makefile index df8fae691bf5..728112309ae2 100644 --- a/audio/mp3info/files/patch-Makefile +++ b/audio/mp3info/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2012-11-30 13:59:48.000000000 +0800 -+++ Makefile 2012-11-30 14:00:09.000000000 +0800 -@@ -44,8 +44,8 @@ +--- Makefile.orig 2006-11-10 00:14:11 UTC ++++ Makefile +@@ -44,8 +44,8 @@ INSTALL = /usr/bin/install -c STRIP = strip LIBS = -lncurses @@ -10,3 +10,4 @@ +CFLAGS ?= -O -pipe all: mp3info gmp3info doc + diff --git a/audio/mp3lint/files/patch-Makefile.PL b/audio/mp3lint/files/patch-Makefile.PL index 21c2b42fb508..45ffffb53e4b 100644 --- a/audio/mp3lint/files/patch-Makefile.PL +++ b/audio/mp3lint/files/patch-Makefile.PL @@ -1,4 +1,4 @@ ---- Makefile.PL.orig 2015-04-22 12:59:15 UTC +--- Makefile.PL.orig 2003-11-16 07:07:26 UTC +++ Makefile.PL @@ -124,7 +124,7 @@ sub MY::install { my $self = shift; diff --git a/audio/mp3plot/files/patch-src__macros.h b/audio/mp3plot/files/patch-src_macros.h similarity index 77% rename from audio/mp3plot/files/patch-src__macros.h rename to audio/mp3plot/files/patch-src_macros.h index 1ff355a8acbf..a6e8f1f8b7de 100644 --- a/audio/mp3plot/files/patch-src__macros.h +++ b/audio/mp3plot/files/patch-src_macros.h @@ -1,5 +1,5 @@ ---- src/macros.h.orig 2009-04-14 11:21:18.000000000 +0900 -+++ src/macros.h 2009-05-10 02:55:54.000000000 +0900 +--- src/macros.h.orig 2009-04-14 02:21:18 UTC ++++ src/macros.h @@ -34,7 +34,7 @@ // References of interest: // diff --git a/audio/mp3stat/files/patch-base.cpp b/audio/mp3stat/files/patch-base.cpp index dbb26395a441..ddfe7c41baa9 100644 --- a/audio/mp3stat/files/patch-base.cpp +++ b/audio/mp3stat/files/patch-base.cpp @@ -1,4 +1,4 @@ ---- base.cpp.orig +--- base.cpp.orig 2004-09-21 01:29:25 UTC +++ base.cpp @@ -1,4 +1,5 @@ -#include diff --git a/audio/mp3stat/files/patch-input_mp3_mp3stat.cpp b/audio/mp3stat/files/patch-input_mp3_mp3stat.cpp index 8e72c1f4dd7d..de5e61ccdb02 100644 --- a/audio/mp3stat/files/patch-input_mp3_mp3stat.cpp +++ b/audio/mp3stat/files/patch-input_mp3_mp3stat.cpp @@ -1,5 +1,5 @@ ---- input/mp3/mp3stat.cpp.orig Tue Sep 14 12:50:17 2004 -+++ input/mp3/mp3stat.cpp Tue Sep 14 15:35:44 2004 +--- input/mp3/mp3stat.cpp.orig 2004-09-16 00:32:05 UTC ++++ input/mp3/mp3stat.cpp @@ -5,6 +5,7 @@ * mp3check - check mp3 file for consistency and print infos * Copyright (C) 1998 by Johannes Overmann diff --git a/audio/mp3stat/files/patch-input__vorbis__oggstat.cpp b/audio/mp3stat/files/patch-input_vorbis_oggstat.cpp similarity index 65% rename from audio/mp3stat/files/patch-input__vorbis__oggstat.cpp rename to audio/mp3stat/files/patch-input_vorbis_oggstat.cpp index 0871455a927c..9cfd8b14c7d2 100644 --- a/audio/mp3stat/files/patch-input__vorbis__oggstat.cpp +++ b/audio/mp3stat/files/patch-input_vorbis_oggstat.cpp @@ -1,4 +1,4 @@ ---- input/vorbis/oggstat.cpp.orig +--- input/vorbis/oggstat.cpp.orig 2004-09-16 00:32:20 UTC +++ input/vorbis/oggstat.cpp @@ -1,3 +1,4 @@ +#include diff --git a/audio/mp3stat/files/patch-input_vorbis_oggstat.h b/audio/mp3stat/files/patch-input_vorbis_oggstat.h index d9470caad1cd..444d943e3987 100644 --- a/audio/mp3stat/files/patch-input_vorbis_oggstat.h +++ b/audio/mp3stat/files/patch-input_vorbis_oggstat.h @@ -1,5 +1,5 @@ ---- input/vorbis/oggstat.h.orig Thu Sep 16 08:03:59 2004 -+++ input/vorbis/oggstat.h Tue Sep 21 21:08:41 2004 +--- input/vorbis/oggstat.h.orig 2004-09-15 23:03:59 UTC ++++ input/vorbis/oggstat.h @@ -5,6 +5,7 @@ #include #include diff --git a/audio/mp3stat/files/patch-ui.cpp b/audio/mp3stat/files/patch-ui.cpp index 86856e3c02a8..a06f428f143b 100644 --- a/audio/mp3stat/files/patch-ui.cpp +++ b/audio/mp3stat/files/patch-ui.cpp @@ -1,5 +1,5 @@ ---- ui.cpp.orig Fri Sep 17 09:54:41 2004 -+++ ui.cpp Tue Sep 21 20:28:28 2004 +--- ui.cpp.orig 2004-09-30 03:54:19 UTC ++++ ui.cpp @@ -1,4 +1,5 @@ #include "ui.h" +#include diff --git a/audio/mp3stat/files/patch-ui__console__cli.cpp b/audio/mp3stat/files/patch-ui_console_cli.cpp similarity index 72% rename from audio/mp3stat/files/patch-ui__console__cli.cpp rename to audio/mp3stat/files/patch-ui_console_cli.cpp index 04d31adc1d19..91cb8191754d 100644 --- a/audio/mp3stat/files/patch-ui__console__cli.cpp +++ b/audio/mp3stat/files/patch-ui_console_cli.cpp @@ -1,4 +1,4 @@ ---- ui/console/cli.cpp.orig +--- ui/console/cli.cpp.orig 2016-07-26 15:21:43 UTC +++ ui/console/cli.cpp @@ -1,4 +1,5 @@ -#include diff --git a/audio/mp3stat/files/patch-ui_gtk_gtk2-ui.cpp b/audio/mp3stat/files/patch-ui_gtk_gtk2__ui.cpp similarity index 64% rename from audio/mp3stat/files/patch-ui_gtk_gtk2-ui.cpp rename to audio/mp3stat/files/patch-ui_gtk_gtk2__ui.cpp index 4dac4afd24dd..fa2f144d02e0 100644 --- a/audio/mp3stat/files/patch-ui_gtk_gtk2-ui.cpp +++ b/audio/mp3stat/files/patch-ui_gtk_gtk2__ui.cpp @@ -1,6 +1,6 @@ ---- ui/gtk/gtk2_ui.cpp.orig Mon Sep 20 14:04:50 2004 -+++ ui/gtk/gtk2_ui.cpp Tue Sep 21 22:54:39 2004 -@@ -279,7 +279,7 @@ +--- ui/gtk/gtk2_ui.cpp.orig 2004-09-30 04:07:54 UTC ++++ ui/gtk/gtk2_ui.cpp +@@ -285,7 +285,7 @@ gtk2_ui::gtk_interface() Info chosen; Info chosen2; diff --git a/audio/mp3wrap/files/patch-crc.c b/audio/mp3wrap/files/patch-crc.c index 34a0baca1fe8..969e6741c4eb 100644 --- a/audio/mp3wrap/files/patch-crc.c +++ b/audio/mp3wrap/files/patch-crc.c @@ -1,5 +1,5 @@ ---- crc.c.orig Mon Jun 2 20:41:23 2003 -+++ crc.c Mon Jun 2 20:43:24 2003 +--- crc.c.orig 2003-01-10 22:19:35 UTC ++++ crc.c @@ -25,7 +25,7 @@ #include diff --git a/audio/mpdbrowser/files/patch-setup.py b/audio/mpdbrowser/files/patch-setup.py index 2d02a0b76ead..910ac30bb41e 100644 --- a/audio/mpdbrowser/files/patch-setup.py +++ b/audio/mpdbrowser/files/patch-setup.py @@ -1,6 +1,6 @@ ---- ./setup.py.orig 2010-12-27 18:06:29.000000000 +0100 -+++ ./setup.py 2014-05-14 23:15:44.000000000 +0200 -@@ -62,9 +62,7 @@ +--- setup.py.orig 2010-12-27 17:06:29 UTC ++++ setup.py +@@ -62,9 +62,7 @@ os.system("intltool-merge -d -u po mpd # Create mo files: if not os.path.exists("mo/"): os.mkdir("mo/") diff --git a/audio/mpg321/files/patch-ao.c b/audio/mpg321/files/patch-ao.c index 46f3c0555576..385c1ffbc4ce 100644 --- a/audio/mpg321/files/patch-ao.c +++ b/audio/mpg321/files/patch-ao.c @@ -1,6 +1,6 @@ ---- ao.c.orig +--- ao.c.orig 2002-03-24 05:49:47 UTC +++ ao.c -@@ -229,6 +229,7 @@ +@@ -229,6 +229,7 @@ void open_ao_playdevice(struct mad_heade and restore it afterwards */ signal(SIGINT, SIG_DFL); diff --git a/audio/mpg321/files/patch-mpg321.c b/audio/mpg321/files/patch-mpg321.c index df561df237a5..f89d23a317df 100644 --- a/audio/mpg321/files/patch-mpg321.c +++ b/audio/mpg321/files/patch-mpg321.c @@ -1,6 +1,6 @@ ---- mpg321.c.orig +--- mpg321.c.orig 2002-03-24 05:49:20 UTC +++ mpg321.c -@@ -188,7 +188,7 @@ +@@ -188,7 +188,7 @@ static int show_id3(struct id3_tag const else { @@ -9,7 +9,7 @@ free(names[i]); } } -@@ -203,7 +203,7 @@ +@@ -203,7 +203,7 @@ static int show_id3(struct id3_tag const if (!names[i]) { fprintf (stderr, emptystring); } else { @@ -18,7 +18,7 @@ free (names[i]); } if (i%2) fprintf (stderr, "\n"); -@@ -285,6 +285,8 @@ +@@ -285,6 +285,8 @@ int main(int argc, char *argv[]) signal(SIGINT, SIG_DFL); playbuf.buf = NULL; @@ -27,7 +27,7 @@ playbuf.fd = -1; playbuf.length = 0; playbuf.done = 0; -@@ -410,12 +412,14 @@ +@@ -410,12 +412,14 @@ int main(int argc, char *argv[]) if(fstat(fd, &stat) == -1) { @@ -42,7 +42,7 @@ continue; } -@@ -432,6 +436,7 @@ +@@ -432,6 +436,7 @@ int main(int argc, char *argv[]) if((playbuf.buf = mmap(0, playbuf.length, PROT_READ, MAP_SHARED, fd, 0)) == MAP_FAILED) { @@ -50,7 +50,7 @@ mpg321_error(currentfile); continue; } -@@ -509,9 +514,6 @@ +@@ -509,9 +514,6 @@ int main(int argc, char *argv[]) mad_decoder_finish(&decoder); @@ -60,7 +60,7 @@ if (playbuf.frames) free(playbuf.frames); -@@ -521,6 +523,7 @@ +@@ -521,6 +523,7 @@ int main(int argc, char *argv[]) if (playbuf.fd == -1) { munmap(playbuf.buf, playbuf.length); @@ -68,14 +68,14 @@ } else -@@ -535,10 +538,6 @@ - ao_close(playdevice); +@@ -536,10 +539,6 @@ int main(int argc, char *argv[]) ao_shutdown(); -- + -#if defined(RAW_SUPPORT) || defined(HTTP_SUPPORT) || defined(FTP_SUPPORT) - if(fd) close(fd); -#endif - +- return(0); } + diff --git a/audio/mpg321/files/patch-network.c b/audio/mpg321/files/patch-network.c index eba18f6bbdd5..508a5f259693 100644 --- a/audio/mpg321/files/patch-network.c +++ b/audio/mpg321/files/patch-network.c @@ -1,6 +1,6 @@ ---- network.c.orig +--- network.c.orig 2002-03-24 05:49:56 UTC +++ network.c -@@ -225,7 +225,8 @@ +@@ -225,7 +225,8 @@ int http_open(char *arg) * a html page and not the stream */ snprintf(http_request, sizeof(http_request), "GET /%s HTTP/1.0\r\n" /* "User-Agent: Mozilla/2.0 (Win95; I)\r\n" */ diff --git a/audio/mpiosh/files/patch-Makefile.am b/audio/mpiosh/files/patch-Makefile.am index de8196510db1..f2bb3ba254bc 100644 --- a/audio/mpiosh/files/patch-Makefile.am +++ b/audio/mpiosh/files/patch-Makefile.am @@ -1,5 +1,5 @@ ---- Makefile.am.orig 2009-04-08 01:40:10.000000000 +0400 -+++ Makefile.am 2009-04-08 01:40:14.000000000 +0400 +--- Makefile.am.orig 2004-04-19 12:19:19 UTC ++++ Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS=@MPIO_KERNEL@ libmpio mpiosh etc tools hotplug +SUBDIRS=@MPIO_KERNEL@ libmpio mpiosh etc tools diff --git a/audio/mpiosh/files/patch-configure.in b/audio/mpiosh/files/patch-configure.in index 3200ddfdb2f6..d1290540c6f1 100644 --- a/audio/mpiosh/files/patch-configure.in +++ b/audio/mpiosh/files/patch-configure.in @@ -1,6 +1,6 @@ ---- configure.in.orig 2009-04-08 01:37:33.000000000 +0400 -+++ configure.in 2009-04-08 01:37:43.000000000 +0400 -@@ -80,14 +80,6 @@ +--- configure.in.orig 2016-07-26 15:22:25 UTC ++++ configure.in +@@ -74,14 +74,6 @@ AC_CHECK_HEADER(usb.h,[ # This 'test' call uses non-standard syntax and will fail on most # systems, but it's just informational so any warning can be ignored. diff --git a/audio/mpiosh/files/patch-libmpio-debug.h b/audio/mpiosh/files/patch-libmpio-debug.h deleted file mode 100644 index 988685381e36..000000000000 --- a/audio/mpiosh/files/patch-libmpio-debug.h +++ /dev/null @@ -1,11 +0,0 @@ ---- libmpio/debug.h.orig Thu Jun 19 19:47:19 2003 -+++ libmpio/debug.h Thu Jun 19 19:47:39 2003 -@@ -27,7 +27,7 @@ - #ifdef sun - #include - #else --#include -+#include - #endif - - #ifdef __cplusplus diff --git a/audio/mpiosh/files/patch-libmpio_Makefile.am b/audio/mpiosh/files/patch-libmpio_Makefile.am index 2c15db42bb4f..3537fd031fdf 100644 --- a/audio/mpiosh/files/patch-libmpio_Makefile.am +++ b/audio/mpiosh/files/patch-libmpio_Makefile.am @@ -1,5 +1,5 @@ ---- libmpio/Makefile.am.orig 2009-04-08 01:38:43.000000000 +0400 -+++ libmpio/Makefile.am 2009-04-08 01:38:48.000000000 +0400 +--- libmpio/Makefile.am.orig 2003-10-19 21:06:34 UTC ++++ libmpio/Makefile.am @@ -1,6 +1,6 @@ INCLUDES=@MPLIB_INCLUDE@ AM_CFLAGS=@MPLIB_CFLAGS@ @USB_CFLAGS@ diff --git a/audio/mpiosh/files/patch-libmpio_debug.h b/audio/mpiosh/files/patch-libmpio_debug.h new file mode 100644 index 000000000000..28c645f8c374 --- /dev/null +++ b/audio/mpiosh/files/patch-libmpio_debug.h @@ -0,0 +1,11 @@ +--- libmpio/debug.h.orig 2003-04-27 12:08:20 UTC ++++ libmpio/debug.h +@@ -41,7 +41,7 @@ + #ifdef sun + #include + #else +-#include ++#include + #endif + + #ifdef __cplusplus diff --git a/audio/mpiosh/files/patch-mpiosh-callback.c b/audio/mpiosh/files/patch-mpiosh-callback.c deleted file mode 100644 index d40deae5fff3..000000000000 --- a/audio/mpiosh/files/patch-mpiosh-callback.c +++ /dev/null @@ -1,17 +0,0 @@ ---- mpiosh/callback.c.orig Thu Jun 19 19:51:43 2003 -+++ mpiosh/callback.c Thu Jun 19 19:52:29 2003 -@@ -29,11 +29,14 @@ - #include - #include - #include -+#include - - #include "mpiosh.h" - #include "command.h" - - #include "libmpio/debug.h" -+ -+#define NAME_MAX PATH_MAX - - /* commands */ - void diff --git a/audio/mpiosh/files/patch-mpiosh_Makefile.am b/audio/mpiosh/files/patch-mpiosh_Makefile.am index 22e6b0fff8a6..f9c56d516d5a 100644 --- a/audio/mpiosh/files/patch-mpiosh_Makefile.am +++ b/audio/mpiosh/files/patch-mpiosh_Makefile.am @@ -1,6 +1,6 @@ ---- mpiosh/Makefile.am.orig 2009-04-08 01:39:27.000000000 +0400 -+++ mpiosh/Makefile.am 2009-04-08 01:39:41.000000000 +0400 -@@ -12,7 +12,7 @@ +--- mpiosh/Makefile.am.orig 2002-10-29 20:03:34 UTC ++++ mpiosh/Makefile.am +@@ -12,7 +12,7 @@ mpiosh_SOURCES = mpiosh.c \ AM_CFLAGS=-DSYSCONFDIR=\"@sysconfdir@\" @@ -9,7 +9,7 @@ noinst_HEADERS = mpiosh.h \ callback.h \ -@@ -20,4 +20,4 @@ +@@ -20,4 +20,4 @@ noinst_HEADERS = mpiosh.h \ command.h \ global.h \ cfgio.h \ diff --git a/audio/mpiosh/files/patch-mpiosh_callback.c b/audio/mpiosh/files/patch-mpiosh_callback.c new file mode 100644 index 000000000000..9acc206ac543 --- /dev/null +++ b/audio/mpiosh/files/patch-mpiosh_callback.c @@ -0,0 +1,18 @@ +--- mpiosh/callback.c.orig 2004-04-23 19:21:08 UTC ++++ mpiosh/callback.c +@@ -31,12 +31,15 @@ + #include + #include + #include ++#include + + #include "mpiosh.h" + #include "command.h" + + #include "libmpio/debug.h" + ++#define NAME_MAX PATH_MAX ++ + /* helper */ + BYTE + mpiosh_ftype2ascii(BYTE ftype) { diff --git a/audio/mpiosh/files/patch-mpiosh-mpiosh.c b/audio/mpiosh/files/patch-mpiosh_mpiosh.c similarity index 73% rename from audio/mpiosh/files/patch-mpiosh-mpiosh.c rename to audio/mpiosh/files/patch-mpiosh_mpiosh.c index 5dfeadbc5ee7..bd308b7dd67c 100644 --- a/audio/mpiosh/files/patch-mpiosh-mpiosh.c +++ b/audio/mpiosh/files/patch-mpiosh_mpiosh.c @@ -1,16 +1,16 @@ ---- mpiosh/mpiosh.c.orig Thu Nov 14 02:05:28 2002 -+++ mpiosh/mpiosh.c Thu Jun 19 19:59:10 2003 +--- mpiosh/mpiosh.c.orig 2003-08-25 19:38:57 UTC ++++ mpiosh/mpiosh.c @@ -39,6 +39,8 @@ #include "readline.h" #include "mpiosh.h" - + +#define SA_NOMASK 0 + /* mpiosh core functions */ void mpiosh_init(void) -@@ -113,7 +115,9 @@ - +@@ -121,7 +123,9 @@ main(int argc, char *argv[]) { + while ((line = readline(mpiosh.prompt))) { if ((*line == '\0') || mpiosh_cancel) { +#if 0 diff --git a/audio/mpiosh/files/patch-mpiosh-readline.c b/audio/mpiosh/files/patch-mpiosh_readline.c similarity index 62% rename from audio/mpiosh/files/patch-mpiosh-readline.c rename to audio/mpiosh/files/patch-mpiosh_readline.c index f77f989c4d35..7a87ac6bd54d 100644 --- a/audio/mpiosh/files/patch-mpiosh-readline.c +++ b/audio/mpiosh/files/patch-mpiosh_readline.c @@ -1,9 +1,9 @@ ---- mpiosh/readline.c.orig Thu Jun 19 19:57:05 2003 -+++ mpiosh/readline.c Thu Jun 19 19:57:32 2003 +--- mpiosh/readline.c.orig 2003-04-23 08:34:16 UTC ++++ mpiosh/readline.c @@ -26,6 +26,8 @@ #include "command.h" #include "mpiosh.h" - + +#define rl_completion_matches completion_matches + /* readline extensions */ diff --git a/audio/mumble/files/patch-compiler.pri b/audio/mumble/files/patch-compiler.pri index c6fc59df69af..6466fc46acf4 100644 --- a/audio/mumble/files/patch-compiler.pri +++ b/audio/mumble/files/patch-compiler.pri @@ -1,6 +1,6 @@ ---- compiler.pri.orig 2011-02-24 16:24:49.000000000 -0500 -+++ compiler.pri 2011-02-24 16:26:09.000000000 -0500 -@@ -103,9 +103,9 @@ +--- compiler.pri.orig 2014-08-08 15:51:59 UTC ++++ compiler.pri +@@ -109,9 +109,9 @@ unix { unix:!macx { CONFIG(debug, debug|release) { diff --git a/audio/mumble/files/patch-overlay-overlay.h b/audio/mumble/files/patch-overlay-overlay.h deleted file mode 100644 index a7f88f164294..000000000000 --- a/audio/mumble/files/patch-overlay-overlay.h +++ /dev/null @@ -1,29 +0,0 @@ -diff -r -C 2 mumble-1.1.8/overlay/overlay.h overlay/overlay.h -*** mumble-1.1.8/overlay/overlay.h 2009-03-22 16:05:00.000000000 +0100 ---- overlay/overlay.h 2009-08-06 20:07:48.000000000 +0200 -*************** -*** 43,46 **** ---- 43,65 ---- - #define OVERLAY_VERSION_SUB 0 - -+ /* BSD support */ -+ #ifndef ElfW -+ # ifdef __FreeBSD__ -+ # if __ELF_WORD_SIZE == 32 -+ # define ElfW(type) Elf32_##type -+ # else -+ # define ElfW(type) Elf64_##type -+ # endif -+ # else -+ # ifdef __NetBSD__ -+ # if ELFSIZE == 32 -+ # define ElfW(type) Elf32_##type -+ # else -+ # define ElfW(type) Elf64_##type -+ # endif -+ # endif -+ # endif -+ #endif -+ - struct TextEntry { - unsigned int color; diff --git a/audio/mumble/files/patch-overlay_gl-overlay.c b/audio/mumble/files/patch-overlay_gl-overlay.c index 3323640e6630..b7c34e68d84f 100644 --- a/audio/mumble/files/patch-overlay_gl-overlay.c +++ b/audio/mumble/files/patch-overlay_gl-overlay.c @@ -1,10 +1,10 @@ ---- overlay_gl/overlay.c~ 2011-02-19 16:35:15.000000000 -0500 -+++ overlay_gl/overlay.c 2011-02-27 16:04:32.000000000 -0500 +--- overlay_gl/overlay.c.orig 2014-08-08 15:51:59 UTC ++++ overlay_gl/overlay.c @@ -45,6 +45,7 @@ #include #include #include +#include #include + #include #include - #include diff --git a/audio/mumble/files/patch-overlay_overlay.h b/audio/mumble/files/patch-overlay_overlay.h new file mode 100644 index 000000000000..b94a68923dd5 --- /dev/null +++ b/audio/mumble/files/patch-overlay_overlay.h @@ -0,0 +1,28 @@ +--- overlay/overlay.h.orig 2014-08-08 15:51:59 UTC ++++ overlay/overlay.h +@@ -42,6 +42,25 @@ struct OverlayMsgHeader { + #define OVERLAY_MSGTYPE_INIT 0 + struct OverlayMsgInit { + unsigned int uiWidth; ++/* BSD support */ ++#ifndef ElfW ++# ifdef __FreeBSD__ ++# if __ELF_WORD_SIZE == 32 ++# define ElfW(type) Elf32_##type ++# else ++# define ElfW(type) Elf64_##type ++# endif ++# else ++# ifdef __NetBSD__ ++# if ELFSIZE == 32 ++# define ElfW(type) Elf32_##type ++# else ++# define ElfW(type) Elf64_##type ++# endif ++# endif ++# endif ++#endif ++ + unsigned int uiHeight; + }; + diff --git a/audio/mumble/files/patch-plugins-plugins.pri b/audio/mumble/files/patch-plugins-plugins.pri index 5915cb684865..9c8cebe61052 100644 --- a/audio/mumble/files/patch-plugins-plugins.pri +++ b/audio/mumble/files/patch-plugins-plugins.pri @@ -1,7 +1,7 @@ Disable debug; runs into cryptic errors on 9+/amd64 ---- plugins/plugins.pri.orig 2013-06-04 10:06:48.955586932 -0500 -+++ plugins/plugins.pri 2013-06-04 10:07:37.450613576 -0500 +--- plugins/plugins.pri.orig 2014-08-08 15:51:59 UTC ++++ plugins/plugins.pri @@ -1,7 +1,7 @@ include(../compiler.pri) @@ -11,7 +11,7 @@ Disable debug; runs into cryptic errors on 9+/amd64 CONFIG -= qt DIST *= mumble_plugin.h -@@ -10,12 +10,7 @@ +@@ -10,12 +10,7 @@ CONFIG(static) { CONFIG += qt_dynamic_lookup } diff --git a/audio/mumble/files/patch-src-Net.cpp b/audio/mumble/files/patch-src-Net.cpp index 5904139aaf3c..f8bb61dd1384 100644 --- a/audio/mumble/files/patch-src-Net.cpp +++ b/audio/mumble/files/patch-src-Net.cpp @@ -1,7 +1,7 @@ ---- src/Net.cpp.orig 2010-01-08 00:37:46.000000000 +0200 -+++ src/Net.cpp 2010-01-10 23:55:48.000000000 +0200 -@@ -29,6 +29,12 @@ - */ +--- src/Net.cpp.orig 2014-08-08 15:51:59 UTC ++++ src/Net.cpp +@@ -31,6 +31,12 @@ + #include "murmur_pch.h" #include "Net.h" +#ifdef __FreeBSD__ diff --git a/audio/mumble/files/patch-src-mumble-CELTCodec.cpp b/audio/mumble/files/patch-src-mumble-CELTCodec.cpp index b8d3d2f3a0eb..fdcdb3324ae8 100644 --- a/audio/mumble/files/patch-src-mumble-CELTCodec.cpp +++ b/audio/mumble/files/patch-src-mumble-CELTCodec.cpp @@ -1,6 +1,6 @@ ---- src/mumble/CELTCodec.cpp.orig 2013-08-07 07:26:41.259860710 +0200 -+++ src/mumble/CELTCodec.cpp 2013-08-07 07:27:58.905421337 +0200 -@@ -64,6 +64,7 @@ +--- src/mumble/CELTCodec.cpp.orig 2014-08-08 15:51:59 UTC ++++ src/mumble/CELTCodec.cpp +@@ -64,6 +64,7 @@ CELTCodec::CELTCodec(const QString &vers alternatives << QString::fromLatin1("libcelt0.so.%1").arg(version); alternatives << QString::fromLatin1("libcelt.so.%1").arg(version); alternatives << QString::fromLatin1("celt.so.%1").arg(version); @@ -8,4 +8,3 @@ #else int cpuinfo[4]; __cpuid(cpuinfo, 1); - diff --git a/audio/mumble/files/patch-src-mumble-OSS.cpp b/audio/mumble/files/patch-src-mumble-OSS.cpp deleted file mode 100644 index 596269e4681f..000000000000 --- a/audio/mumble/files/patch-src-mumble-OSS.cpp +++ /dev/null @@ -1,30 +0,0 @@ ---- src/mumble/OSS.cpp.orig 2013-08-03 14:01:25.000000000 +0200 -+++ src/mumble/OSS.cpp 2013-08-03 14:12:51.000000000 +0200 -@@ -153,7 +153,6 @@ - qhOutput.insert(QString(), QLatin1String("Default OSS Device")); - qhDevices.insert(QString(), QLatin1String("/dev/dsp")); - --#if (SOUND_VERSION >= 0x040002) - int mixerfd = open("/dev/mixer", O_RDWR, 0); - if (mixerfd == -1) { - qWarning("OSSEnumerator: Failed to open /dev/mixer"); -@@ -182,15 +181,14 @@ - if (ainfo.caps & PCM_CAP_HIDDEN) - continue; - -- qhDevices.insert(handle, device); -+ qhDevices.insert(name, device); - - if (ainfo.caps & PCM_CAP_INPUT) -- qhInput.insert(handle, name); -+ qhInput.insert(name, name); - if (ainfo.caps & PCM_CAP_OUTPUT) -- qhOutput.insert(handle, name); -+ qhOutput.insert(name, name); - } - close(mixerfd); --#endif - } - - OSSInput::OSSInput() { - diff --git a/audio/mumble/files/patch-src-mumble-ServerHandler.cpp b/audio/mumble/files/patch-src-mumble-ServerHandler.cpp index 6f00c7a48327..321b28b9b706 100644 --- a/audio/mumble/files/patch-src-mumble-ServerHandler.cpp +++ b/audio/mumble/files/patch-src-mumble-ServerHandler.cpp @@ -1,7 +1,7 @@ ---- src/mumble/ServerHandler.cpp.orig 2013-06-04 11:44:15.381594007 -0500 -+++ src/mumble/ServerHandler.cpp 2013-06-04 11:44:36.772583833 -0500 -@@ -45,6 +45,12 @@ - #include "PacketDataStream.h" +--- src/mumble/ServerHandler.cpp.orig 2014-08-08 15:51:59 UTC ++++ src/mumble/ServerHandler.cpp +@@ -46,6 +46,12 @@ + #include "RichTextEditor.h" #include "SSL.h" #include "User.h" +#ifdef __FreeBSD__ diff --git a/audio/mumble/files/patch-src-mumble-mumble.pro b/audio/mumble/files/patch-src-mumble-mumble.pro index 12517ae6f1a2..cb36a8f10f13 100644 --- a/audio/mumble/files/patch-src-mumble-mumble.pro +++ b/audio/mumble/files/patch-src-mumble-mumble.pro @@ -1,6 +1,6 @@ ---- src/mumble/mumble.pro.orig 2013-06-04 11:46:38.900573055 -0500 -+++ src/mumble/mumble.pro 2013-06-04 11:47:41.836576507 -0500 -@@ -161,7 +161,16 @@ +--- src/mumble/mumble.pro.orig 2014-08-08 15:51:59 UTC ++++ src/mumble/mumble.pro +@@ -161,7 +161,16 @@ unix { CONFIG *= link_pkgconfig diff --git a/audio/mumble/files/patch-src__mumble__OSS.cpp b/audio/mumble/files/patch-src__mumble__OSS.cpp index 123d3c38dd82..10ee5d91d003 100644 --- a/audio/mumble/files/patch-src__mumble__OSS.cpp +++ b/audio/mumble/files/patch-src__mumble__OSS.cpp @@ -1,6 +1,33 @@ ---- ./src/mumble/OSS.cpp.orig 2013-06-01 21:16:31.000000000 +0000 -+++ ./src/mumble/OSS.cpp 2013-10-12 02:38:45.443221514 +0000 -@@ -221,20 +221,23 @@ +--- src/mumble/OSS.cpp.orig 2014-08-08 15:51:59 UTC ++++ src/mumble/OSS.cpp +@@ -153,7 +153,6 @@ OSSEnumerator::OSSEnumerator() { + qhOutput.insert(QString(), QLatin1String("Default OSS Device")); + qhDevices.insert(QString(), QLatin1String("/dev/dsp")); + +-#if (SOUND_VERSION >= 0x040002) + int mixerfd = open("/dev/mixer", O_RDWR, 0); + if (mixerfd == -1) { + qWarning("OSSEnumerator: Failed to open /dev/mixer"); +@@ -182,15 +181,14 @@ OSSEnumerator::OSSEnumerator() { + if (ainfo.caps & PCM_CAP_HIDDEN) + continue; + +- qhDevices.insert(handle, device); ++ qhDevices.insert(name, device); + + if (ainfo.caps & PCM_CAP_INPUT) +- qhInput.insert(handle, name); ++ qhInput.insert(name, name); + if (ainfo.caps & PCM_CAP_OUTPUT) +- qhOutput.insert(handle, name); ++ qhOutput.insert(name, name); + } + close(mixerfd); +-#endif + } + + OSSInput::OSSInput() { +@@ -221,20 +219,23 @@ void OSSInput::run() { ival = AFMT_S16_NE; if ((ioctl(fd, SNDCTL_DSP_SETFMT, &ival) == -1) || (ival != AFMT_S16_NE)) { qWarning("OSSInput: Failed to set sound format"); @@ -27,7 +54,7 @@ } iMicFreq = ival; -@@ -258,8 +261,6 @@ +@@ -258,8 +259,6 @@ void OSSInput::run() { qWarning("OSSInput: Releasing."); ioctl(fd, SNDCTL_DSP_RESET, NULL); diff --git a/audio/murmur/files/patch-compiler.pri b/audio/murmur/files/patch-compiler.pri index d76d9c4dbc0b..d98fd8abfc25 100644 --- a/audio/murmur/files/patch-compiler.pri +++ b/audio/murmur/files/patch-compiler.pri @@ -1,6 +1,6 @@ ---- compiler.pri.orig 2009-12-11 03:05:44.000000000 +0900 -+++ compiler.pri 2009-12-22 02:29:38.000000000 +0900 -@@ -93,7 +93,7 @@ +--- compiler.pri.orig 2015-07-09 13:23:46 UTC ++++ compiler.pri +@@ -111,7 +111,7 @@ unix:!macx { CONFIG(debug, debug|release) { QMAKE_CFLAGS *= -fstack-protector -fPIE -pie QMAKE_CXXFLAGS *= -fstack-protector -fPIE -pie diff --git a/audio/murmur/files/patch-initialize-SSL b/audio/murmur/files/patch-initialize-SSL index 5513176cc423..aa959f47b2b9 100644 --- a/audio/murmur/files/patch-initialize-SSL +++ b/audio/murmur/files/patch-initialize-SSL @@ -8,9 +8,9 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804363 Bug-Mumble: https://github.com/mumble-voip/mumble/issues/1876 Last-Updated: 2015-11-10 ---- src/mumble/main.cpp +--- src/mumble/main.cpp.orig 2015-07-09 13:23:46 UTC +++ src/mumble/main.cpp -@@ -170,6 +170,9 @@ +@@ -170,6 +170,9 @@ int main(int argc, char **argv) { os_init(); #endif @@ -20,9 +20,9 @@ Last-Updated: 2015-11-10 bool bAllowMultiple = false; QUrl url; if (a.arguments().count() > 1) { ---- src/murmur/main.cpp +--- src/murmur/main.cpp.orig 2015-07-09 13:23:46 UTC +++ src/murmur/main.cpp -@@ -203,6 +203,9 @@ +@@ -203,6 +203,9 @@ int main(int argc, char **argv) { qsrand(QDateTime::currentDateTime().toTime_t()); qInstallMsgHandler(murmurMessageOutput); diff --git a/audio/muse/files/patch-Makefile.in b/audio/muse/files/patch-Makefile.in index dc75fda38b3a..06a19bf2a07b 100644 --- a/audio/muse/files/patch-Makefile.in +++ b/audio/muse/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2005-12-27 22:09:38.000000000 +0900 -+++ Makefile.in 2012-06-02 04:45:45.000000000 +0900 -@@ -690,7 +690,7 @@ +--- Makefile.in.orig 2005-12-27 13:09:38 UTC ++++ Makefile.in +@@ -690,7 +690,7 @@ info: info-recursive info-am: diff --git a/audio/muse/files/patch-configure b/audio/muse/files/patch-configure index d620c9b0a075..51c9ada0c7bd 100644 --- a/audio/muse/files/patch-configure +++ b/audio/muse/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Tue Dec 27 16:03:15 2005 -+++ configure Fri Aug 4 11:51:41 2006 -@@ -1894,7 +1894,7 @@ +--- configure.orig 2005-12-27 13:03:15 UTC ++++ configure +@@ -1894,7 +1894,7 @@ uversion=`uname -r | sed -e 's/-.*$//g;s echo "$as_me:$LINENO: checking for which platform we are compiling" >&5 echo $ECHO_N "checking for which platform we are compiling... $ECHO_C" >&6 case $uname in @@ -9,7 +9,7 @@ echo "$as_me:$LINENO: result: Linux" >&5 echo "${ECHO_T}Linux" >&6 -@@ -2613,16 +2613,12 @@ +@@ -2613,16 +2613,12 @@ if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -29,7 +29,7 @@ fi echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -@@ -3738,7 +3734,7 @@ +@@ -3738,7 +3734,7 @@ fi #AM_DEFINE_UNQUOTED(HOST_CPU, "${host_cpu}") #CFLAGS="-O4 -D_REENTRANT -fomit-frame-pointer -march=${host_cpu} -ffast-math -malign-double -funroll-loops -pipe" @@ -38,7 +38,7 @@ ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -14588,7 +14584,7 @@ +@@ -14588,7 +14584,7 @@ if test "${ac_cv_c99_lrint+set}" = set; else lrint_save_CFLAGS=$CFLAGS @@ -47,7 +47,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -14665,7 +14661,7 @@ +@@ -14665,7 +14661,7 @@ if test "${ac_cv_c99_lrintf+set}" = set; else lrintf_save_CFLAGS=$CFLAGS diff --git a/audio/muse/files/patch-src__Makefile.in b/audio/muse/files/patch-src_Makefile.in similarity index 61% rename from audio/muse/files/patch-src__Makefile.in rename to audio/muse/files/patch-src_Makefile.in index abd4d08a05b1..8f04dfe2616b 100644 --- a/audio/muse/files/patch-src__Makefile.in +++ b/audio/muse/files/patch-src_Makefile.in @@ -1,6 +1,6 @@ ---- src/Makefile.in.orig Fri Aug 4 11:43:41 2006 -+++ src/Makefile.in Fri Aug 4 11:43:46 2006 -@@ -268,7 +268,6 @@ +--- src/Makefile.in.orig 2005-12-27 13:09:36 UTC ++++ src/Makefile.in +@@ -268,7 +268,6 @@ muse_LDADD = \ $(top_srcdir)/src/libmpeg/libmpeg.a \ $(top_srcdir)/src/shout/libshout.a \ $(top_srcdir)/src/portaudio/libportaudio.a \ diff --git a/audio/muse/files/patch-src__jmixer.cpp b/audio/muse/files/patch-src_jmixer.cpp similarity index 87% rename from audio/muse/files/patch-src__jmixer.cpp rename to audio/muse/files/patch-src_jmixer.cpp index b00c3f06560c..a0d82346df2f 100644 --- a/audio/muse/files/patch-src__jmixer.cpp +++ b/audio/muse/files/patch-src_jmixer.cpp @@ -1,5 +1,5 @@ ---- src/jmixer.cpp.orig 2004-12-16 20:04:31.000000000 +0900 -+++ src/jmixer.cpp 2012-05-29 07:39:23.000000000 +0900 +--- src/jmixer.cpp.orig 2004-12-16 11:04:31 UTC ++++ src/jmixer.cpp @@ -20,18 +20,19 @@ */ @@ -26,7 +26,7 @@ #include #include #include -@@ -640,7 +641,11 @@ +@@ -640,7 +641,11 @@ bool Stream_mixer::set_playmode(int ch, /* this is the function selecting files for the scandir on freebsd systems you should change the following line to: int selector(struct dirent *dir) { */ diff --git a/audio/muse/files/patch-src__libmpeg__mpegtoraw.cc b/audio/muse/files/patch-src_libmpeg_mpegtoraw.cc similarity index 69% rename from audio/muse/files/patch-src__libmpeg__mpegtoraw.cc rename to audio/muse/files/patch-src_libmpeg_mpegtoraw.cc index 6032cdc86627..5c388cf890ee 100644 --- a/audio/muse/files/patch-src__libmpeg__mpegtoraw.cc +++ b/audio/muse/files/patch-src_libmpeg_mpegtoraw.cc @@ -1,5 +1,5 @@ ---- src/libmpeg/mpegtoraw.cc.orig Mon Dec 8 21:20:37 2003 -+++ src/libmpeg/mpegtoraw.cc Mon Apr 19 23:00:18 2004 +--- src/libmpeg/mpegtoraw.cc.orig 2003-12-08 12:20:37 UTC ++++ src/libmpeg/mpegtoraw.cc @@ -9,8 +9,8 @@ #include #endif @@ -11,7 +11,7 @@ #include #include "mpegsound.h" -@@ -419,7 +419,7 @@ +@@ -419,7 +419,7 @@ bool Mpegtoraw::loadheader(void) return true; } diff --git a/audio/muse/files/patch-src_linklist.h b/audio/muse/files/patch-src_linklist.h index 93ecc15d3e37..2bdc384be731 100644 --- a/audio/muse/files/patch-src_linklist.h +++ b/audio/muse/files/patch-src_linklist.h @@ -1,6 +1,6 @@ ---- src/linklist.h.orig Sun Oct 1 18:28:22 2006 -+++ src/linklist.h Sun Oct 1 18:28:52 2006 -@@ -44,7 +44,7 @@ +--- src/linklist.h.orig 2004-02-13 16:58:16 UTC ++++ src/linklist.h +@@ -44,7 +44,7 @@ class Linklist { bool movedown(int pos); bool moveto(int num, int pos); Entry *pick(int pos); diff --git a/audio/muse/files/patch-src__outchannels.cpp b/audio/muse/files/patch-src_outchannels.cpp similarity index 73% rename from audio/muse/files/patch-src__outchannels.cpp rename to audio/muse/files/patch-src_outchannels.cpp index b35b3ac2c444..ed61b09da1b4 100644 --- a/audio/muse/files/patch-src__outchannels.cpp +++ b/audio/muse/files/patch-src_outchannels.cpp @@ -1,5 +1,5 @@ ---- src/outchannels.cpp.orig Thu Apr 15 22:12:15 2004 -+++ src/outchannels.cpp Mon Apr 19 22:37:58 2004 +--- src/outchannels.cpp.orig 2004-12-15 18:18:06 UTC ++++ src/outchannels.cpp @@ -24,11 +24,11 @@ #include #include diff --git a/audio/muse/files/patch-src__pipe.cpp b/audio/muse/files/patch-src_pipe.cpp similarity index 61% rename from audio/muse/files/patch-src__pipe.cpp rename to audio/muse/files/patch-src_pipe.cpp index aac653714a64..d6dc5f97af0c 100644 --- a/audio/muse/files/patch-src__pipe.cpp +++ b/audio/muse/files/patch-src_pipe.cpp @@ -1,6 +1,6 @@ ---- src/pipe.cpp.orig Sat Dec 24 18:19:31 2005 -+++ src/pipe.cpp Fri Aug 4 11:48:06 2006 -@@ -25,9 +25,9 @@ +--- src/pipe.cpp.orig 2005-12-24 15:19:31 UTC ++++ src/pipe.cpp +@@ -25,9 +25,9 @@ Boston, MA 02111-1307, USA. */ #include diff --git a/audio/muse/files/patch-src__shout__sock.c b/audio/muse/files/patch-src_shout_sock.c similarity index 62% rename from audio/muse/files/patch-src__shout__sock.c rename to audio/muse/files/patch-src_shout_sock.c index 19956755987e..3d8a57773d94 100644 --- a/audio/muse/files/patch-src__shout__sock.c +++ b/audio/muse/files/patch-src_shout_sock.c @@ -1,6 +1,6 @@ ---- src/shout/sock.c.orig Tue Mar 30 01:04:27 2004 -+++ src/shout/sock.c Mon Apr 19 23:32:09 2004 -@@ -336,7 +336,11 @@ +--- src/shout/sock.c.orig 2004-03-29 16:04:27 UTC ++++ src/shout/sock.c +@@ -336,7 +336,11 @@ int sock_write_fmt(sock_t sock, const ch int rc = SOCK_ERROR; va_list ap_retry; diff --git a/audio/musepack/files/patch-configure.in b/audio/musepack/files/patch-configure.in index 49b0124945c3..fd0497b5db29 100644 --- a/audio/musepack/files/patch-configure.in +++ b/audio/musepack/files/patch-configure.in @@ -1,6 +1,6 @@ ---- configure.in.orig 2014-08-04 08:34:39.000000000 +0200 -+++ configure.in 2014-08-04 08:35:20.000000000 +0200 -@@ -30,7 +30,8 @@ +--- configure.in.orig 2009-07-29 21:00:32 UTC ++++ configure.in +@@ -30,7 +30,8 @@ AC_ARG_ENABLE([mpcchap], [AS_HELP_STRING AM_CONDITIONAL([MPC_CHAP], [test "x$enable_mpcchap" = xyes]) diff --git a/audio/musescore/files/patch-CMakeLists.txt b/audio/musescore/files/patch-CMakeLists.txt index ea98c932d7e1..71fcf351ed73 100644 --- a/audio/musescore/files/patch-CMakeLists.txt +++ b/audio/musescore/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2015-07-16 10:58:43 UTC +--- CMakeLists.txt.orig 2015-07-16 21:02:34 UTC +++ CMakeLists.txt @@ -74,6 +74,10 @@ option(HAS_AUDIOFILE "enable audio expor option(USE_SYSTEM_QTSINGLEAPPLICATION "Use system QtSingleApplication" OFF) diff --git a/audio/musescore/files/patch-mscore-CMakeLists.txt b/audio/musescore/files/patch-mscore_CMakeLists.txt similarity index 82% rename from audio/musescore/files/patch-mscore-CMakeLists.txt rename to audio/musescore/files/patch-mscore_CMakeLists.txt index 27a9b1c33ccd..4371aa3dcfaa 100644 --- a/audio/musescore/files/patch-mscore-CMakeLists.txt +++ b/audio/musescore/files/patch-mscore_CMakeLists.txt @@ -1,4 +1,4 @@ ---- mscore/CMakeLists.txt.orig 2015-07-16 10:58:43 UTC +--- mscore/CMakeLists.txt.orig 2015-07-16 21:02:34 UTC +++ mscore/CMakeLists.txt @@ -474,7 +474,6 @@ else (MINGW) ${ALSA_LIB} @@ -8,7 +8,7 @@ pthread ) if (USE_PORTAUDIO) -@@ -509,9 +508,6 @@ +@@ -509,9 +508,6 @@ else (MINGW) # gold does not use indirect shared libraries for symbol resolution, Linux only if (NOT APPLE) diff --git a/audio/musescore/files/patch-thirdparty__qzip__qzip.cpp b/audio/musescore/files/patch-thirdparty_qzip_qzip.cpp similarity index 79% rename from audio/musescore/files/patch-thirdparty__qzip__qzip.cpp rename to audio/musescore/files/patch-thirdparty_qzip_qzip.cpp index 156479d037f2..9d6d7bbb8b71 100644 --- a/audio/musescore/files/patch-thirdparty__qzip__qzip.cpp +++ b/audio/musescore/files/patch-thirdparty_qzip_qzip.cpp @@ -1,4 +1,4 @@ ---- thirdparty/qzip/qzip.cpp.orig 2015-07-16 10:58:43 UTC +--- thirdparty/qzip/qzip.cpp.orig 2015-07-16 21:02:34 UTC +++ thirdparty/qzip/qzip.cpp @@ -45,6 +45,9 @@ #include "qzipreader_p.h" diff --git a/audio/napster/files/patch-doc__Makefile.in b/audio/napster/files/patch-doc_Makefile.in similarity index 65% rename from audio/napster/files/patch-doc__Makefile.in rename to audio/napster/files/patch-doc_Makefile.in index c7394856d010..a7c816b7efcf 100644 --- a/audio/napster/files/patch-doc__Makefile.in +++ b/audio/napster/files/patch-doc_Makefile.in @@ -1,6 +1,6 @@ ---- doc/Makefile.in.orig Wed Jun 23 11:20:36 2004 -+++ doc/Makefile.in Wed Jun 23 11:22:22 2004 -@@ -124,7 +124,7 @@ +--- doc/Makefile.in.orig 2006-11-05 02:25:23 UTC ++++ doc/Makefile.in +@@ -134,7 +134,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ EXTRA_DIST = nap.1.in userguide.html napster.txt diff --git a/audio/nas/files/patch-clients_audio_audemo_audemo.c b/audio/nas/files/patch-clients_audio_audemo_audemo.c index 4620732d03b0..05b0ba8db1b3 100644 --- a/audio/nas/files/patch-clients_audio_audemo_audemo.c +++ b/audio/nas/files/patch-clients_audio_audemo_audemo.c @@ -1,36 +1,46 @@ ---- clients/audio/audemo/audemo.c Sun Jun 20 15:06:50 2004 -+++ clients/audio/audemo/audemo.c Mon Oct 10 11:12:15 2005 -@@ -29,4 +29,5 @@ +--- clients/audio/audemo/audemo.c.orig 2013-10-07 17:05:48 UTC ++++ clients/audio/audemo/audemo.c +@@ -28,6 +28,7 @@ + */ #include "config.h" +#include #include -@@ -973,5 +973,5 @@ + #if defined(HAVE_STDLIB_H) +@@ -913,7 +914,7 @@ okAction(Widget w, XEvent *event, String + GlobalDataPtr globals; /* retrieve the address of the globals from the first parameter */ - globals = (GlobalDataPtr) atoi(params[0]); + globals = (GlobalDataPtr)(uintptr_t)strtoull(params[0], NULL, 0); saveOk(w, globals, 0); } -@@ -1296,5 +1296,5 @@ + +@@ -1198,7 +1199,7 @@ static void + scrollProcCB(Widget w, XtPointer globalsp, XtPointer positionp) { GlobalDataPtr globals = (GlobalDataPtr) globalsp; - int position = (int) positionp; + intptr_t position = (intptr_t) positionp; int newVolume; char buf[50]; -@@ -1363,5 +1363,5 @@ + +@@ -1258,7 +1259,7 @@ static void + gainScrollCB(Widget w, XtPointer globalsp, XtPointer positionp) { GlobalDataPtr globals = (GlobalDataPtr) globalsp; - int position = (int) positionp; + intptr_t position = (intptr_t) positionp; int newGain; char buf[50]; -@@ -1457,5 +1457,5 @@ + +@@ -1342,7 +1343,7 @@ makeSaveDialog(GlobalDataPtr g) + MakeWidget(s->file, s->form, asciiTextWidgetClass, NULL, "filename"); /* pass the address of the globals as an argument to the action */ - sprintf(tmp, "Return: ok(%u)", (unsigned int) g); + sprintf(tmp, "Return: ok(%p)", g); XtOverrideTranslations(s->file, XtParseTranslationTable(tmp)); + /* file format */ diff --git a/audio/nas/files/patch-clients_audio_auedit_Graph.c b/audio/nas/files/patch-clients_audio_auedit_Graph.c index 3b1a50905eaf..965022e11f5d 100644 --- a/audio/nas/files/patch-clients_audio_auedit_Graph.c +++ b/audio/nas/files/patch-clients_audio_auedit_Graph.c @@ -1,26 +1,32 @@ ---- clients/audio/auedit/Graph.c Sun Jun 20 15:01:41 2004 -+++ clients/audio/auedit/Graph.c Mon Oct 10 11:21:15 2005 -@@ -29,4 +29,5 @@ +--- clients/audio/auedit/Graph.c.orig 2013-04-27 00:41:00 UTC ++++ clients/audio/auedit/Graph.c +@@ -28,6 +28,7 @@ + */ #include "config.h" +#include #if defined(HAVE_LIMITS_H) -@@ -453,5 +454,5 @@ + # include +@@ -452,14 +453,14 @@ GraphWidget old, + if (w->graph.leftMarker != old->graph.leftMarker) { XtCallCallbacks((Widget) w, XtNleftProc, - (XtPointer) w->graph.leftMarker); + (XtPointer)(intptr_t)w->graph.leftMarker); redraw = TRUE; } -@@ -460,5 +461,5 @@ + + if (w->graph.rightMarker != old->graph.rightMarker) { XtCallCallbacks((Widget) w, XtNrightProc, - (XtPointer) w->graph.rightMarker); + (XtPointer)(intptr_t)w->graph.rightMarker); redraw = TRUE; } -@@ -540,8 +541,8 @@ + +@@ -539,10 +540,10 @@ XButtonEvent *event; + if (w->graph.marker == GraphLeftMarker) XtCallCallbacks((Widget) w, XtNleftProc, - (XtPointer) w->graph.leftMarker); @@ -31,3 +37,4 @@ + (XtPointer)(intptr_t)w->graph.rightMarker); } + /* public functions */ diff --git a/audio/nas/files/patch-clients_audio_auedit_auedit.c b/audio/nas/files/patch-clients_audio_auedit_auedit.c index 7bf5bb1079be..a35745e61d52 100644 --- a/audio/nas/files/patch-clients_audio_auedit_auedit.c +++ b/audio/nas/files/patch-clients_audio_auedit_auedit.c @@ -1,36 +1,46 @@ ---- clients/audio/auedit/auedit.c Sun Jun 20 15:06:50 2004 -+++ clients/audio/auedit/auedit.c Mon Oct 10 11:16:16 2005 -@@ -28,4 +28,5 @@ +--- clients/audio/auedit/auedit.c.orig 2013-10-07 17:05:48 UTC ++++ clients/audio/auedit/auedit.c +@@ -27,6 +27,7 @@ + * $NCDId: @(#)auedit.c,v 1.35 1995/12/06 01:10:29 greg Exp $ */ +#include #include -@@ -390,5 +390,5 @@ + #include "config.h" +@@ -389,7 +390,7 @@ XtPointer gp; + XtPointer pp; { GlobalDataPtr g = (GlobalDataPtr) gp; - int p = (int) pp; + intptr_t p = (intptr_t) pp; int n; -@@ -406,5 +406,5 @@ + XtVaGetValues(g->graph, XtNrightMarker, &n, NULL); +@@ -405,7 +406,7 @@ XtPointer gp; + XtPointer pp; { GlobalDataPtr g = (GlobalDataPtr) gp; - int p = (int) pp; + intptr_t p = (intptr_t) pp; int n; -@@ -457,5 +457,5 @@ + XtVaGetValues(g->graph, XtNleftMarker, &n, NULL); +@@ -456,7 +457,7 @@ XtPointer gp; + XtPointer gainp; { GlobalDataPtr g = (GlobalDataPtr) gp; - int gain = (int) gainp; + intptr_t gain = (intptr_t) gainp; AuDeviceAttributes da; -@@ -1844,5 +1844,5 @@ + if (!AuDeviceChangableMask(AuServerDevice(g->aud, +@@ -1843,7 +1844,7 @@ XtPointer gp; + XtPointer valuep; { GlobalDataPtr g = (GlobalDataPtr) gp; - int value = (int) valuep; + intptr_t value = (intptr_t) valuep; AuElementParameters *parms; ElementListPtr p = ElementList; + int i = 0; diff --git a/audio/nas/files/patch-clients_audio_aupanel_aupanel.c b/audio/nas/files/patch-clients_audio_aupanel_aupanel.c index ef466560e4ee..a0ac1fb8fd05 100644 --- a/audio/nas/files/patch-clients_audio_aupanel_aupanel.c +++ b/audio/nas/files/patch-clients_audio_aupanel_aupanel.c @@ -1,5 +1,5 @@ ---- clients/audio/aupanel/aupanel.c.orig Tue Nov 22 03:09:06 2005 -+++ clients/audio/aupanel/aupanel.c Sat May 20 10:58:12 2006 +--- clients/audio/aupanel/aupanel.c.orig 2013-10-07 17:05:47 UTC ++++ clients/audio/aupanel/aupanel.c @@ -28,6 +28,7 @@ */ @@ -8,7 +8,7 @@ #include #ifndef SYSV #include