pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/multimedia/liboggz liboggz: remove all patches



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c7dddd473f0d
branches:  trunk
changeset: 354444:c7dddd473f0d
user:      maya <maya%pkgsrc.org@localhost>
date:      Sun Oct 30 09:41:58 2016 +0000

description:
liboggz: remove all patches

these patches were intended to fix build on Open/Free-BSD and are simply wrong
and broke the build on linux before and now on OS X.

"it declares an uninitialized timezone structure and uses it to adjust the date.
 ...even if struct timezone weren't deprecated."

PR pkg/50558, report on pkgsrc-users by Emre Eryilmaz

diffstat:

 multimedia/liboggz/distinfo                                           |   4 +-
 multimedia/liboggz/patches/patch-src_tools_oggz-chop_httpdate.c       |  28 ----------
 multimedia/liboggz/patches/patch-src_tools_oggz-chop_httpdate__test.c |  28 ----------
 3 files changed, 1 insertions(+), 59 deletions(-)

diffs (77 lines):

diff -r a6fa44c3fe23 -r c7dddd473f0d multimedia/liboggz/distinfo
--- a/multimedia/liboggz/distinfo       Sun Oct 30 09:08:57 2016 +0000
+++ b/multimedia/liboggz/distinfo       Sun Oct 30 09:41:58 2016 +0000
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.4 2016/01/03 20:54:50 markd Exp $
+$NetBSD: distinfo,v 1.5 2016/10/30 09:41:58 maya Exp $
 
 SHA1 (liboggz-1.1.1.tar.gz) = 3540190c8c9a31d834aa7794ef991bbab699f4de
 RMD160 (liboggz-1.1.1.tar.gz) = e85073131bc8ec021b1529487ef21802d01b0260
 SHA512 (liboggz-1.1.1.tar.gz) = 8f5fc8ca49cb6f7a1160a9c1932876b771d55985d59ddc1f48497dfc08641414a58244d7a7e52bfcecdb69f52913d0123efd8f92513f8b9064e4abe1442f2cba
 Size (liboggz-1.1.1.tar.gz) = 702261 bytes
-SHA1 (patch-src_tools_oggz-chop_httpdate.c) = e99506865b72aacc98fdc26f0ab838f95f438066
-SHA1 (patch-src_tools_oggz-chop_httpdate__test.c) = c2d7c3ce0bdb6d3f14b71b9846d6e3f3ebd22f99
diff -r a6fa44c3fe23 -r c7dddd473f0d multimedia/liboggz/patches/patch-src_tools_oggz-chop_httpdate.c
--- a/multimedia/liboggz/patches/patch-src_tools_oggz-chop_httpdate.c   Sun Oct 30 09:08:57 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-$NetBSD: patch-src_tools_oggz-chop_httpdate.c,v 1.2 2016/01/03 20:54:50 markd Exp $
-
-Fix build for {Free,Open}BSD.
-
---- src/tools/oggz-chop/httpdate.c.orig        2010-01-30 05:55:59.000000000 +0000
-+++ src/tools/oggz-chop/httpdate.c
-@@ -33,6 +33,9 @@ time_t
- httpdate_parse (char * s, int n)
- {
-   struct tm d;
-+#ifndef __linux__
-+  struct timezone tzone;
-+#endif
-   char wday[3], month[3];
-   int i;
- 
-@@ -60,7 +63,11 @@ httpdate_parse (char * s, int n)
- 
-   d.tm_year -= 1900;
- 
-+#ifdef __linux__
-   d.tm_sec -= timezone;
-+#else
-+  d.tm_sec -= (tzone.tz_minuteswest * 60);
-+#endif
- 
-   return mktime (&d);
- }
diff -r a6fa44c3fe23 -r c7dddd473f0d multimedia/liboggz/patches/patch-src_tools_oggz-chop_httpdate__test.c
--- a/multimedia/liboggz/patches/patch-src_tools_oggz-chop_httpdate__test.c     Sun Oct 30 09:08:57 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-$NetBSD: patch-src_tools_oggz-chop_httpdate__test.c,v 1.2 2016/01/03 20:54:50 markd Exp $
-
-Fix build for {Free,Open}BSD.
-
---- src/tools/oggz-chop/httpdate_test.c.orig   2010-01-30 05:55:59.000000000 +0000
-+++ src/tools/oggz-chop/httpdate_test.c
-@@ -13,6 +13,9 @@ main (int argc, char * argv[])
-   char * d_in = "Mon, 06 Feb 2006 11:20:01 GMT";
-   char d_out[30];
-   time_t t;
-+#ifndef __linux__
-+  struct timezone tzone;
-+#endif
- 
-   INFO ("Parsing date:");
-   INFO (d_in);
-@@ -21,7 +24,11 @@ main (int argc, char * argv[])
-   if (t == (time_t)-1) {
-     FAIL ("Parse error");
-   } else {
-+#ifdef __linux__
-     t -= timezone;
-+#else
-+    t -= tzone.tz_minuteswest;
-+#endif
-     httpdate_snprint (d_out, 30, t);
- 
-     INFO ("Output date:");



Home | Main Index | Thread Index | Old Index