diff options
| author | wiz <wiz@pkgsrc.org> | 2019-07-21 10:34:51 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2019-07-21 10:34:51 +0000 |
| commit | 6644d90568eb04d3419e4c84c418e5e510bcf62d (patch) | |
| tree | 8b6ae730fa8bd96d050d57f447fb5ce30a6a4370 | |
| parent | 7ee2a38c933b039af6292d4017d5eca8cd56630c (diff) | |
| download | pkgsrc-6644d90568eb04d3419e4c84c418e5e510bcf62d.tar.gz | |
gdk-pixbuf: remove
The software hasn't been updated since 2002 and is probably full
of security problems. Two packages were using it. (gpsdrive has a
newer version in wip.)
40 files changed, 8 insertions, 1180 deletions
diff --git a/doc/CHANGES-2019 b/doc/CHANGES-2019 index 7493d1c9b53..a4b85f33cf2 100644 --- a/doc/CHANGES-2019 +++ b/doc/CHANGES-2019 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2019,v 1.3000 2019/07/21 10:12:14 wiz Exp $ +$NetBSD: CHANGES-2019,v 1.3001 2019/07/21 10:34:51 wiz Exp $ Changes to the packages collection and infrastructure in 2019: @@ -4932,3 +4932,6 @@ Changes to the packages collection and infrastructure in 2019: Removed graphics/gdk-pixbuf2-jasper [wiz 2019-07-21] Updated graphics/gdk-pixbuf2 to 2.38.1 [wiz 2019-07-21] Updated graphics/gdk-pixbuf2-xlib to 2.38.1 [wiz 2019-07-21] + Removed geography/gpsdrive [wiz 2019-07-21] + Removed x11/xmms-osd [wiz 2019-07-21] + Removed graphics/gdk-pixbuf successor graphics/gdk-pixbuf2 [wiz 2019-07-21] diff --git a/geography/Makefile b/geography/Makefile index 58606ea4fe1..5c927d35684 100644 --- a/geography/Makefile +++ b/geography/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2018/12/21 12:09:09 wen Exp $ +# $NetBSD: Makefile,v 1.71 2019/07/21 10:34:52 wiz Exp $ # COMMENT= Software for geographical-related uses @@ -21,7 +21,6 @@ SUBDIR+= geos SUBDIR+= gipfel SUBDIR+= gpsbabel SUBDIR+= gpsd -SUBDIR+= gpsdrive SUBDIR+= gpspoint SUBDIR+= gpsutils SUBDIR+= gpxsee diff --git a/geography/gpsdrive/DESCR b/geography/gpsdrive/DESCR deleted file mode 100644 index f0e8079efc9..00000000000 --- a/geography/gpsdrive/DESCR +++ /dev/null @@ -1,9 +0,0 @@ -GpsDrive is a car (bike, ship, plane) navigation system. GpsDrive -displays your position provided from your NMEA capable GPS receiver on a -zoomable map, the map file is autoselected depending of the position and -prefered scale. Speech output is supported if the "festival" software -is running. The maps are autoselected for best resolution depending of -your position and can be downloaded from Internet. All Garmin GPS -reveiver with a serial output should be usable, also other GPS receiver -which supports NMEA protocol. GpsDrive is written in C with use of the -GTK+ graphic toolkit. diff --git a/geography/gpsdrive/Makefile b/geography/gpsdrive/Makefile deleted file mode 100644 index 77a707bfd03..00000000000 --- a/geography/gpsdrive/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# $NetBSD: Makefile,v 1.34 2018/08/22 09:45:09 wiz Exp $ - -DISTNAME= gpsdrive-1.31 -PKGREVISION= 26 -CATEGORIES= geography -MASTER_SITES= http://gpsdrive.kraftvoll.at/ - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.gpsdrive.de/index.shtml -COMMENT= GPS Navigation system -LICENSE= gnu-gpl-v2 - -DEPENDS+= gpsd>=1.07:../../geography/gpsd -DEPENDS+= wget>=1:../../net/wget - -GNU_CONFIGURE= YES -USE_PKGLOCALEDIR= YES - -USE_LANGUAGES= c c++ -USE_LIBTOOL= yes -USE_TOOLS+= bash:run perl:run - -# XXX make this an option -CONFIGURE_ARGS+= --disable-mysql - -REPLACE_BASH= src/gpsfetchmap -REPLACE_PERL= src/*.pl src/wpcvt - -.include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/glib/buildlink3.mk" -.include "../../x11/gtk/buildlink3.mk" -.include "../../graphics/gdk-pixbuf/buildlink3.mk" -.include "../../converters/libiconv/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/geography/gpsdrive/PLIST b/geography/gpsdrive/PLIST deleted file mode 100644 index 7b4b0afb0ac..00000000000 --- a/geography/gpsdrive/PLIST +++ /dev/null @@ -1,43 +0,0 @@ -@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:57:16 joerg Exp $ -bin/garble -bin/gpsdrive -bin/gpsfetchmap -bin/gpsfetchmap.pl -bin/gpspoint2gpsdrive.pl -bin/wpcvt -bin/wpget -lib/libfly.la -lib/libnautic.la -man/de/man1/gpsdrive.1 -man/es/man1/gpsdrive.1 -man/man1/gpsdrive.1 -share/gpsdrive/friendsicon.png -share/gpsdrive/gpsdrive/AUTHORS -share/gpsdrive/gpsdrive/FAQ.gpsdrive -share/gpsdrive/gpsdrive/FAQ.gpsdrive.fr -share/gpsdrive/gpsdrive/GPS-receivers -share/gpsdrive/gpsdrive/LEEME -share/gpsdrive/gpsdrive/LISEZMOI -share/gpsdrive/gpsdrive/NMEA.txt -share/gpsdrive/gpsdrive/README -share/gpsdrive/gpsdrive/README.FreeBSD -share/gpsdrive/gpsdrive/README.SQL -share/gpsdrive/gpsdrive/README.gpspoint2gspdrive -share/gpsdrive/gpsdrive/README.kismet -share/gpsdrive/gpsdrive/TODO -share/gpsdrive/gpsdrive/create.sql -share/gpsdrive/gpsdrive/wp2sql -share/gpsdrive/gpsdrivesplash.png -share/locale/da/LC_MESSAGES/gpsdrive.mo -share/locale/de/LC_MESSAGES/gpsdrive.mo -share/locale/de_AT/LC_MESSAGES/gpsdrive.mo -share/locale/es/LC_MESSAGES/gpsdrive.mo -share/locale/fr/LC_MESSAGES/gpsdrive.mo -share/locale/hu/LC_MESSAGES/gpsdrive.mo -share/locale/it/LC_MESSAGES/gpsdrive.mo -share/locale/nl/LC_MESSAGES/gpsdrive.mo -share/locale/no/LC_MESSAGES/gpsdrive.mo -share/locale/pt_BR/LC_MESSAGES/gpsdrive.mo -share/locale/sk/LC_MESSAGES/gpsdrive.mo -share/locale/sv/LC_MESSAGES/gpsdrive.mo -share/locale/tr/LC_MESSAGES/gpsdrive.mo diff --git a/geography/gpsdrive/distinfo b/geography/gpsdrive/distinfo deleted file mode 100644 index ad549d8ac89..00000000000 --- a/geography/gpsdrive/distinfo +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: distinfo,v 1.6 2015/11/03 00:08:42 agc Exp $ - -SHA1 (gpsdrive-1.31.tar.gz) = 296a06d264c5fbb077c91f3529b4e6f122423f05 -RMD160 (gpsdrive-1.31.tar.gz) = 56ea8fb9355e0381d55aeb691757c59c9e332406 -SHA512 (gpsdrive-1.31.tar.gz) = 2a3a61ded2e3f199fdd25285bfd84bedabb5b17d2613f64be45deabdd256ba73ba9fcdfd711497918df7d732adada204152da95048c612b9148c2e804b1ac684 -Size (gpsdrive-1.31.tar.gz) = 784379 bytes -SHA1 (patch-aa) = cc5dd44020ffc5f22dc958c938b9f98ff6e01810 -SHA1 (patch-ab) = 240901fe52e41db1a41299f66ac61c06898f1881 -SHA1 (patch-ac) = 78e21378bc10d4a1098827d25308f59432b180f1 -SHA1 (patch-ad) = 05d6be6ba7bd37b4b0599092ace2d5db7825c01d -SHA1 (patch-ae) = 5ab12f3f1f94a84acac0bc47fb4ad5a3bb75b7b6 -SHA1 (patch-af) = ba047381fcf07b3797c73199f85536b2a7efb61e -SHA1 (patch-src_garmin__application.cpp) = 8b682f5545e67ff2906cec9fc44cbf601b0bd399 diff --git a/geography/gpsdrive/patches/patch-aa b/geography/gpsdrive/patches/patch-aa deleted file mode 100644 index 9f8a3578294..00000000000 --- a/geography/gpsdrive/patches/patch-aa +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/07/26 23:33:35 wiz Exp $ - -- We depend on the gpsd package instead of using the bundled one -- friendsd is broken and I don't care enough to fix it - ---- src/Makefile.in.orig Sun Dec 8 13:30:56 2002 -+++ src/Makefile.in Sun Jan 5 12:15:01 2003 -@@ -122,7 +122,7 @@ - - @DISABLEGARMIN_TRUE@PRG1 = - @DISABLEGARMIN_FALSE@PRG1 = garble --bin_PROGRAMS = $(PRG1) gpsdrive gpsd friendsd -+bin_PROGRAMS = $(PRG1) gpsdrive - LIBS = - - # gpsdrive_LDADD= $(GLIB_LIBS) $(GTK_LIBS) $(PIXLIBS) -@@ -175,10 +175,8 @@ - libnautic_la_LIBADD = - am_libnautic_la_OBJECTS = nautic.lo - libnautic_la_OBJECTS = $(am_libnautic_la_OBJECTS) --@DISABLEGARMIN_TRUE@bin_PROGRAMS = gpsdrive$(EXEEXT) gpsd$(EXEEXT) \ --@DISABLEGARMIN_TRUE@ friendsd$(EXEEXT) --@DISABLEGARMIN_FALSE@bin_PROGRAMS = garble$(EXEEXT) gpsdrive$(EXEEXT) \ --@DISABLEGARMIN_FALSE@ gpsd$(EXEEXT) friendsd$(EXEEXT) -+@DISABLEGARMIN_TRUE@bin_PROGRAMS = gpsdrive$(EXEEXT) -+@DISABLEGARMIN_FALSE@bin_PROGRAMS = garble$(EXEEXT) gpsdrive$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - - am_friendsd_OBJECTS = friendsd.$(OBJEXT) diff --git a/geography/gpsdrive/patches/patch-ab b/geography/gpsdrive/patches/patch-ab deleted file mode 100644 index 29c55de3a2f..00000000000 --- a/geography/gpsdrive/patches/patch-ab +++ /dev/null @@ -1,56 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/07/26 23:33:35 wiz Exp $ - -Drew Einhorn's gpsfetchmap.pl enhancements from: - -http://s2.selwerd.nl/~dirk-jan/gpsdrive/archive/msg01772.html - -also require this patch to support tree'd rather than flap map -driectories. - ---- src/gpsdrive.c.orig Sun Dec 8 09:43:33 2002 -+++ src/gpsdrive.c Wed Jan 8 12:20:48 2003 -@@ -2926,12 +2926,22 @@ - } - for (i = 0; i < nrmaps; i++) - { -+ /* strip off the path, we just want to check the filename */ -+ char *fullname; -+ char *rslash; -+ char *filename; -+ - skip = TRUE; -+ -+ fullname = (maps + i)->filename; -+ rslash = strrchr(fullname, '/'); -+ filename = rslash == NULL ? fullname : rslash + 1; -+ - if (displaymap_map) -- if (!(strncmp ((maps + i)->filename, "map_", 4))) -+ if (!(strncmp (filename, "map_", 4))) - skip = FALSE; - if (displaymap_top) -- if (!(strncmp ((maps + i)->filename, "top_", 4))) -+ if (!(strncmp (filename, "top_", 4))) - skip = FALSE; - - if (skip) -@@ -3101,8 +3111,17 @@ - - for (i = 0; i < nrmaps; i++) - { -- if ((strncmp ((maps + i)->filename, "map_", 4))) -- if ((strncmp ((maps + i)->filename, "top_", 4))) -+ /* strip off the path, we just want to check the filename */ -+ char *fullname; -+ char *rslash; -+ char *filename; -+ -+ fullname = (maps + i)->filename; -+ rslash = strrchr(fullname, '/'); -+ filename = rslash == NULL ? fullname : rslash + 1; -+ -+ if ((strncmp (filename, "map_", 4))) -+ if ((strncmp (filename, "top_", 4))) - { - GString *error; - error = g_string_new (NULL); diff --git a/geography/gpsdrive/patches/patch-ac b/geography/gpsdrive/patches/patch-ac deleted file mode 100644 index 1b7e6383171..00000000000 --- a/geography/gpsdrive/patches/patch-ac +++ /dev/null @@ -1,304 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2011/07/03 21:42:24 jym Exp $ - ---- src/gpsfetchmap.pl.orig 2002-11-24 16:04:38.000000000 +0000 -+++ src/gpsfetchmap.pl -@@ -9,38 +9,71 @@ my $VERSION =<<EOP; - gpsfetchmap (c) 2002 Kevin Stephens <gps\@suburbialost.com> - modified (Sept 06, 2002) by Sven Fichtner <sven.fichtner\@flugfunk.de> - modified (Sept 18, 2002) by Sven Fichtner <sven.fichtner\@flugfunk.de> --modified (Nov 21, 2002) by Magnus Månsson <ganja\@0x63.nu> --Version 1.04 -+modified (Nov 21, 2002) by Magnus MÃ¥nsson <ganja\@0x63.nu> -+modified (Dec 24, 2002) by Drew Einhorn <drew.einhorn\@starband.net> -+Version 1.05 - EOP - - use strict; - use Getopt::Long; - use Pod::Usage; -- --# Setup possible scales --my @SCALES = (1000,1500,2000,3000,5000,7500,10000,15000,20000,30000,50000,75000, -- 100000,150000,200000,300000,500000,750000,1000000,1500000,2000000,3000000, -- 5000000,7500000,10000000,15000000,20000000,30000000,50000000,75000000); -+use POSIX qw(floor ceil); -+use File::Temp qw/ tempfile tempdir /; - - # Set defaults and get options from command line - Getopt::Long::Configure('no_ignore_case'); --my ($lat,$lon,$slat,$endlat,$slon,$endlon,$waypoint,$area,$unit,$mapdir,$debug,$force,$version,$man,$help); --my $failcount = 0; -+my (@SCALES,$lat,$lon,$slat,$endlat,$slon,$endlon,$waypoint,$area,$unit,$debug,$force,$version,$man,$help); -+ -+my $failcount; -+my $writecount; -+my $cachecount; - my $polite = 'no'; - my $scale = '50000'; - my $CONFIG_DIR = "$ENV{'HOME'}/.gpsdrive"; # Should we allow config of this? - my $CONFIG_FILE = "$CONFIG_DIR/gpsdriverc"; - my $WAYPT_FILE = "$CONFIG_DIR/way.txt"; --my $KOORD_FILE = 'map_koord.txt'; # Should we allow config of this? - my $FILEPREFIX = 'map_'; - my $mapserver = 'mapblast'; -+my $replace = '0'; -+my $mapdir = ""; - - GetOptions ('lat=f' => \$lat, 'lon=f' => \$lon, 'start-lat=f' => \$slat, 'end-lat=f' => \$endlat, 'start-lon=f' => \$slon, 'end-lon=f' => \$endlon, 'scale=s' => \$scale, 'mapserver=s' => \$mapserver, - 'waypoint=s' =>, \$waypoint, 'area=s' => \$area, 'unit=s' => \$unit,'mapdir=s' => \$mapdir, 'polite:i' => \$polite, - 'WAYPOINT=s' => \$WAYPT_FILE, 'CONFIG=s' => \$CONFIG_FILE, 'PREFIX=s' => \$FILEPREFIX, -- 'FORCE' => \$force, 'debug' => \$debug, 'MAN' => \$man, 'help|x' => \$help, 'version' => \$version) -+ 'FORCE' => \$force, 'debug' => \$debug, 'MAN' => \$man, 'help|x' => \$help, 'version' => \$version, 'replace' => \$replace) - or pod2usage(1); - -+if ($mapdir eq "") { -+ $mapdir = $CONFIG_DIR; -+} else { -+ $mapdir = $CONFIG_DIR/$mapdir; -+} -+my $LOCK_SH = 1; -+my $LOCK_EX = 2; -+my $LOCK_NB = 4; -+my $LOCK_UN = 8; -+ -+my $KOORD_FILE = "$mapdir/map_koord.txt"; # Should we allow config of this? -+open(KOORD,">>$KOORD_FILE") || die "Can't open: $KOORD_FILE"; -+ -+# Setup possible scales -+my %ts1; -+if ($mapserver eq "terraserver") { -+ my ($s, $ts); -+ -+ @SCALES = (); -+ $s = 2757; -+ for ($ts = 10; $ts <= 16; $ts++) { -+ @SCALES = (@SCALES, $s); -+ $ts1{$s} = $ts; -+ $s *= 2; -+ } -+} else { -+ @SCALES = (1000,1500,2000,3000,5000,7500,10000,15000,20000,30000,50000,75000, -+ 100000,150000,200000,300000,500000,750000,1000000,1500000,2000000,3000000, -+ 5000000,7500000,10000000,15000000,20000000,30000000,50000000,75000000); -+} -+ - pod2usage(1) if $help; - pod2usage(-verbose=>2) if $man; - -@@ -55,7 +88,6 @@ pod2usage(1) if (&error_check); - - - # Setup up some constants --my $EXPEDIAFACT = 1378.6; - my $DIFF = 0.0000028; - my $RADIUS_KM = 6371.01; - my $LAT_DIST_KM = 110.87; -@@ -64,7 +96,7 @@ my $KM2MILES = 0.62137119; - - # Get the list of scales we need - my $SCALES_TO_GET_ref = get_scales(\$scale); --print "Scale to download: ", join(",",sort {$a <=> $b} @{$SCALES_TO_GET_ref}), "\n" if ($debug); -+print "Scales to download: ", join(",",sort {$a <=> $b} @{$SCALES_TO_GET_ref}), "\n" if ($debug); - - # Get the center waypoint if they want one - if ($waypoint) { -@@ -82,7 +114,7 @@ $mapdir = &get_mapdir unless ($mapdir); - unless ($slat && $slon && $endlat && $endlon) { - ($slat,$slon,$endlat,$endlon) = get_coords(\$lat,\$lon,\$area,\$unit); - } --print "Upper left: $slat $slon, Lower Right: $endlat, $endlon\n" if ($debug); -+print "Lower left: $slat $slon, Upper Right: $endlat, $endlon\n" if ($debug); - - unless ($force) { - my $count = file_count(\($slat,$slon,$endlat,$endlon)); -@@ -93,61 +125,12 @@ unless ($force) { - - print "\nDownloading files:\n"; - --# Change into the gpsdrive maps directory --chdir($CONFIG_DIR); --chdir($mapdir); -- - # Ok start getting the maps - foreach my $scale (@{$SCALES_TO_GET_ref}) { -- # Setup k -- my $k = $DIFF * $scale; -- my $lati = $slat; -- while ($lati < $endlat) { -- my $long = $slon; -- while ($long < $endlon) { -- my $filename = "$FILEPREFIX$scale-$lati-$long.gif"; -- if (! -s $filename) { -- LOOP: { -- if ($mapserver eq 'expedia') { -- next LOOP if ($scale <=1000); -- my $expediascale= sprintf("%d",$scale / $EXPEDIAFACT); -- my $where; -- if ($lon < -30) { -- $where = 'USA0409'; -- } else { -- $where = 'EUR0809'; -- } -- print "http://msrvmaps.mappoint.net/isapi/MSMap.dll?ID=3XNsF.\&C=$lati,$long\&L=$where\&CV=1\&A=$expediascale\&S=1280,1024\&O=0.000000,0.000000\&MS=0\&P=\n" -- if ($debug); -- `wget -nd -q -O tmpmap.gif "http://msrvmaps.mappoint.net/isapi/MSMap.dll?ID=3XNsF.\&C=$lati,$long\&L=$where\&CV=1\&A=$expediascale\&S=1280,1024\&O=0.000000,0.000000\&MS=0\&P="`; -- $scale = $expediascale * $EXPEDIAFACT; -- } elsif ($mapserver eq 'mapblast') { -- print "http://www.mapblast.com/myblastd/MakeMap.d?\&CT=$lati:$long:$scale\&IC=\&W=1280\&H=1024\&LB=\n" -- if ($debug); -- `wget -nd -q -O tmpmap.gif "http://www.mapblast.com/myblastd/MakeMap.d?\&CT=$lati:$long:$scale\&IC=\&W=1280\&H=1024\&LB="`; -- } -- if (-s 'tmpmap.gif') { -- open(KOORD,">>$KOORD_FILE") || die "Can't open: $KOORD_FILE"; -- print KOORD "$filename $lati $long $scale\n"; -- rename('tmpmap.gif',$filename); -- print "."; -- print "\nWrote $filename\n" if ($debug); -- } else { -- $failcount++; -- print ","; -- } -- } -- # sleep if polite is turned on to be nice to the webserver of the mapserver -- sleep($polite) if ($polite =~ /\d+/); -- sleep(1) if (!$polite); -- } -- $long += $k; -- } -- $lati += $k; -- } --} --print "Failcount: $failcount\n"; --print "\n"; -+ # Setup k -+ my $k = sprintf("%.4f", $DIFF * $scale); -+ getmaps($scale, $slat, $endlat, $slon, $endlon, $k); -+} - - ################################################################################ - # -@@ -155,6 +138,124 @@ print "\n"; - # - ################################################################################ - -+sub getmaps { -+ my ($scale, $slat, $endlat, $slon, $endlon, $k) = @_; -+ -+ print "Getting maps for scale: $scale\n"; -+ -+ my $l = floor($slat / $k); -+ my $lati = $k * $l; -+ -+ $l = ceil($endlat / $k); -+ my $elat = $k * $l; -+ -+ while ($lati <= $elat) { -+ $l = floor($slon / $k); -+ my $long = $k * $l; -+ -+ $l = ceil($endlon / $k); -+ my $elon = $k * $l; -+ -+ while ($long <= $elon) { -+ getmap($scale, $lati, $long); -+ $long += $k; -+ } -+ $lati += $k; -+ } -+ print "\n"; -+ print "Failcount: $failcount\n"; -+ print "Cachecount: $cachecount\n"; -+ print "Writecount: $writecount\n"; -+} -+ -+sub lock { -+ flock KOORD, $LOCK_EX; -+ # Move past addtions by other processes -+ seek KOORD, 0, 2; -+} -+ -+sub unlock { -+ flock KOORD, $LOCK_UN; -+} -+ -+sub getmap { -+ my ($scale, $lati, $long) = @_; -+ my $filename; -+ my $url; -+ my $la; -+ my $lo; -+ -+ $la = sprintf("%.4f", $lati); -+ $lo = sprintf("%.4f", $long); -+ -+ my $EXPEDIAFACT = 1378.6; -+ $filename = mapfilename("$FILEPREFIX", $scale, $la, $lo); -+ $url = ""; -+ if (! $replace && -e "$mapdir/$filename") { -+ $cachecount++; -+ print "="; -+ print "\nCached $filename\n" if ($debug); -+ } else { -+ if ($mapserver eq 'expedia' && $scale > 1000) { -+ my $expediascale= sprintf("%d",$scale / $EXPEDIAFACT); -+ my $where; -+ if ($lon < -30) { -+ $where = 'USA0409'; -+ } else { -+ $where = 'EUR0809'; -+ } -+ $url = "http://msrvmaps.mappoint.net/isapi/MSMap.dll?ID=3XNsF.\\&C=$la,$lo\\&L=$where\\&CV=1\\&A=$expediascale\\&S=1280,1024\\&O=0.000000,0.000000\\&MS=0\\&P="; -+ } elsif ($mapserver eq 'mapblast') { -+ $url = "http://www.mapblast.com/myblastd/MakeMap.d?\\&CT=$la:$lo:$scale\\&IC=\\&W=1280\\&H=1024\\&LB="; -+ } elsif ($mapserver eq 'terraserver') { -+ my $sc = $ts1{$scale}; -+ $url = "http://terraservice.net/GetImageArea.ashx?t=1\\&lat=$la\\&lon=$lo\\&s=$sc\\&w=1280\\&h=1024"; -+ } elsif ($mapserver eq 'tiger') { -+ my $s = $scale / 300000.0; -+ $url = "http://tiger.census.gov/cgi-bin/mapper/map.gif?lat=$la\\&lon=$lo\\&wid=0.001\\&ht=$s\\&iwd=1280\\&iht=1024\\&on=majroads\\&on=places\\&on=shorelin\\&on=streets\\&on=interstate\\&on=statehwy\\&on=ushwy\\&on=water\\&tlevel=-\\&tvar=-\\&tmeth=i"; -+ } -+ if ($url ne "") { -+ my $p = "--wait=$polite --random-wait" if (!$polite); -+ my ($fh, $tempfile) = tempfile( "temp_XXXXXX", DIR => "$mapdir" ); -+ -+ `wget $p -nd -q -O $tempfile $url`; -+ print $url if ($debug); -+ -+ if (-s $tempfile) { -+ lock(); -+ print KOORD "$filename $la $lo $scale\n"; -+ unlock(); -+ rename($tempfile, "$mapdir/$filename"); -+ print "."; -+ print "\nWrote $filename\n" if ($debug); -+ $writecount++; -+ } else { -+ $failcount++; -+ print "\nFailed $filename\n"; -+ } -+ # NEED convert to greyscale -+ # and draw grid lines? -+ # using ImageMaqick? -+ } -+ } -+} -+ -+sub mapfilename { -+ my ($prefix, $scale, $lati, $long) = @_; -+ my $pathname; -+ my $filename; -+ -+ if ($mapserver eq 'terraserver') { -+ $scale = $ts1{$scale}; -+ } -+ $pathname=sprintf("%s/%s/%03d/%08.4f/%d/", $mapserver, $scale, $lati, $lati, $long); -+ `mkdir -p "$mapdir/$pathname"`; -+ # I know there's a builtin mkdir, but last time I fussed with it -+ # there was no -p, and using it was tedious -+ $filename = sprintf("%s%d-%08.4f-%09.4f.gif", $prefix, $scale, $lati, $long); -+ return "$pathname$filename"; -+} -+ - sub error_check { - my $status; - diff --git a/geography/gpsdrive/patches/patch-ad b/geography/gpsdrive/patches/patch-ad deleted file mode 100644 index afce7c8e133..00000000000 --- a/geography/gpsdrive/patches/patch-ad +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2004/07/26 23:38:19 wiz Exp $ - ---- src/netlib.c 2004/07/22 11:16:34 1.1 -+++ src/netlib.c 2004/07/22 11:17:03 -@@ -23,7 +23,6 @@ - #include <sys/socket.h> - #include <sys/time.h> - #include <netinet/in.h> --#include <varargs.h> - #include <netdb.h> - #include <stdio.h> - #include <arpa/inet.h> diff --git a/geography/gpsdrive/patches/patch-ae b/geography/gpsdrive/patches/patch-ae deleted file mode 100644 index a35db5c5147..00000000000 --- a/geography/gpsdrive/patches/patch-ae +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2004/07/26 23:38:19 wiz Exp $ - ---- src/garble.cpp 2004/07/22 11:19:47 1.1 -+++ src/garble.cpp 2004/07/22 11:20:55 -@@ -29,6 +29,7 @@ - #include <iostream> - #include <string> - #include <cstdlib> -+#include <cassert> - // #include <ctime> - - using namespace std; diff --git a/geography/gpsdrive/patches/patch-af b/geography/gpsdrive/patches/patch-af deleted file mode 100644 index 26eccbd3db1..00000000000 --- a/geography/gpsdrive/patches/patch-af +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-af,v 1.1 2004/07/26 23:38:19 wiz Exp $ - ---- src/gpsdrivegarble.cpp 2004/07/22 11:30:57 1.1 -+++ src/gpsdrivegarble.cpp 2004/07/22 11:31:15 -@@ -64,6 +64,7 @@ - #include <iostream> - #include <string> - #include <cstdlib> -+#include <cassert> - // #include <ctime> - - using namespace std; diff --git a/geography/gpsdrive/patches/patch-src_garmin__application.cpp b/geography/gpsdrive/patches/patch-src_garmin__application.cpp deleted file mode 100644 index e6c20043967..00000000000 --- a/geography/gpsdrive/patches/patch-src_garmin__application.cpp +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-src_garmin__application.cpp,v 1.1 2011/11/24 14:06:04 joerg Exp $ - ---- src/garmin_application.cpp.orig 2011-11-24 01:00:09.000000000 +0000 -+++ src/garmin_application.cpp -@@ -26,6 +26,7 @@ - #include <iostream> - #endif - -+#include <cstring> - #include <cctype> - #include <algorithm> - diff --git a/graphics/Makefile b/graphics/Makefile index 1124430fd5a..f49c82425da 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.826 2019/07/21 10:09:44 wiz Exp $ +# $NetBSD: Makefile,v 1.827 2019/07/21 10:34:51 wiz Exp $ # COMMENT= Graphics tools and libraries @@ -139,7 +139,6 @@ SUBDIR+= fujiplay SUBDIR+= g2 SUBDIR+= gd SUBDIR+= gdchart -SUBDIR+= gdk-pixbuf SUBDIR+= gdk-pixbuf2 SUBDIR+= gdk-pixbuf2-xlib SUBDIR+= geeqie diff --git a/graphics/gdk-pixbuf/DESCR b/graphics/gdk-pixbuf/DESCR deleted file mode 100644 index 031e9f075cb..00000000000 --- a/graphics/gdk-pixbuf/DESCR +++ /dev/null @@ -1,18 +0,0 @@ - GdkPixbuf is a new GNOME library designed to solve part of Imlib's -design limitations that make it hard to write efficient and highly -modular applications. The GdkPixbuf library provides a basic, -reference counted structure called GdkPixbuf. This structure points -to a block of image data, has fields that describe the format of the -image data, and also contains a reference count. The library also -provides a simple mechanism for loading images from files, and a more -sophisticated mechanism for loading images progressively from -arbitrary buffers. It also provides utility functions to transform -pixbufs and render them to GDK drawables. - -The GdkPixBuf library provides a number of features: - * Image loading facilities. - * Rendering of a GdkPixBuf into various formats: - drawables (windows, pixmaps), GdkRGB buffers. - -This is the gtk 1 version of gdk-pixbuf, which is obsolete. It is -included natively in gtk2+. diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile deleted file mode 100644 index bada2726e56..00000000000 --- a/graphics/gdk-pixbuf/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# $NetBSD: Makefile,v 1.49 2016/08/03 10:22:14 adam Exp $ -# - -.include "Makefile.common" - -PKGREVISION= 20 -COMMENT= The GNOME image loading library - -# XXX hopefully there is no x.gnome-config.x in PATH -post-patch: - ${SED} -e 's/gnome-config/x.gnome-config.x/g' \ - ${WRKSRC}/configure >${WRKSRC}/.tmp && \ - ${MV} ${WRKSRC}/.tmp ${WRKSRC}/configure - ${CHMOD} a+x ${WRKSRC}/configure - -post-configure: - ${SED} -e 's/ doc$$//' ${WRKSRC}/Makefile >${WRKSRC}/.tmp && \ - ${MV} ${WRKSRC}/.tmp ${WRKSRC}/Makefile - -post-install: - ${RM} ${DESTDIR}${PREFIX}/lib/gnomecanvaspixbufConf.sh - -.include "../../mk/bsd.pkg.mk" diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common deleted file mode 100644 index 632729ab9de..00000000000 --- a/graphics/gdk-pixbuf/Makefile.common +++ /dev/null @@ -1,32 +0,0 @@ -# $NetBSD: Makefile.common,v 1.51 2018/01/14 14:58:38 rillig Exp $ -# -# used by graphics/gdk-pixbuf/Makefile - -DISTNAME= gdk-pixbuf-${VER}.0 -CATEGORIES= graphics devel -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdk-pixbuf/${VER}/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= https://www.gnome.org/ - -VER= 0.22 - -USE_TOOLS+= gmake -USE_LIBTOOL= YES - -GNU_CONFIGURE= YES -CONFIGURE_ENV+= path_rgb_txt="${X11BASE}/lib/X11/rgb.txt" - -PLIST_SUBST+= LOCALBASE=${LOCALBASE} - -DISTINFO_FILE= ${.CURDIR}/../gdk-pixbuf/distinfo -PATCHDIR= ${.CURDIR}/../gdk-pixbuf/patches - -BUILDLINK_DEPMETHOD.libXt?= build - -.include "../../mk/jpeg.buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" -.include "../../graphics/tiff/buildlink3.mk" -.include "../../x11/gtk/buildlink3.mk" -.include "../../x11/libXt/buildlink3.mk" diff --git a/graphics/gdk-pixbuf/PLIST b/graphics/gdk-pixbuf/PLIST deleted file mode 100644 index f1ad20708bc..00000000000 --- a/graphics/gdk-pixbuf/PLIST +++ /dev/null @@ -1,22 +0,0 @@ -@comment $NetBSD: PLIST,v 1.8 2018/01/01 22:29:37 rillig Exp $ -bin/gdk-pixbuf-config -include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-features.h -include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-loader.h -include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-xlib.h -include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-xlibrgb.h -include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf.h -lib/gdk-pixbuf/loaders/libpixbufloader-bmp.la -lib/gdk-pixbuf/loaders/libpixbufloader-gif.la -lib/gdk-pixbuf/loaders/libpixbufloader-ico.la -lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.la -lib/gdk-pixbuf/loaders/libpixbufloader-png.la -lib/gdk-pixbuf/loaders/libpixbufloader-pnm.la -lib/gdk-pixbuf/loaders/libpixbufloader-ras.la -lib/gdk-pixbuf/loaders/libpixbufloader-tiff.la -lib/gdk-pixbuf/loaders/libpixbufloader-xbm.la -lib/gdk-pixbuf/loaders/libpixbufloader-xpm.la -lib/gdk_pixbufConf.sh -lib/gdk_pixbuf_xlibConf.sh -lib/libgdk_pixbuf.la -lib/libgdk_pixbuf_xlib.la -share/aclocal/gdk-pixbuf.m4 diff --git a/graphics/gdk-pixbuf/buildlink3.mk b/graphics/gdk-pixbuf/buildlink3.mk deleted file mode 100644 index 03d59d9c9fc..00000000000 --- a/graphics/gdk-pixbuf/buildlink3.mk +++ /dev/null @@ -1,20 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:04:14 rillig Exp $ - -BUILDLINK_TREE+= gdk-pixbuf - -.if !defined(GDK_PIXBUF_BUILDLINK3_MK) -GDK_PIXBUF_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.gdk-pixbuf+= gdk-pixbuf>=0.22.0nb2 -BUILDLINK_ABI_DEPENDS.gdk-pixbuf+= gdk-pixbuf>=0.22.0nb20 -BUILDLINK_PKGSRCDIR.gdk-pixbuf?= ../../graphics/gdk-pixbuf -BUILDLINK_CPPFLAGS.gdk-pixbuf+= \ - -I${BUILDLINK_PREFIX.gdk-pixbuf}/include/gdk-pixbuf-1.0 - -.include "../../mk/jpeg.buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" -.include "../../graphics/tiff/buildlink3.mk" -.include "../../x11/gtk/buildlink3.mk" -.endif # GDK_PIXBUF_BUILDLINK3_MK - -BUILDLINK_TREE+= -gdk-pixbuf diff --git a/graphics/gdk-pixbuf/distinfo b/graphics/gdk-pixbuf/distinfo deleted file mode 100644 index b7200fec7aa..00000000000 --- a/graphics/gdk-pixbuf/distinfo +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: distinfo,v 1.24 2015/11/03 21:33:58 agc Exp $ - -SHA1 (gdk-pixbuf-0.22.0.tar.bz2) = 495324afb5abebc14567ffd5a6cd72333bcc7f5b -RMD160 (gdk-pixbuf-0.22.0.tar.bz2) = 0e56a0f883fd8e3fb4d49b9a38f984b95cd96ece -SHA512 (gdk-pixbuf-0.22.0.tar.bz2) = 69ebc3030f978283a3014dc6037304dd67daf912e6a1eda8d6853aa2ad10a226b310c82049ce78de3665dda363083b08eb3c7942f77a7cd0fc76282d8cfc5a95 -Size (gdk-pixbuf-0.22.0.tar.bz2) = 398208 bytes -SHA1 (patch-aa) = 484feb3482c6832a33f428ce0db26719452dd274 -SHA1 (patch-ab) = 2edd8fdd72d5dfaecc92974c6930e5d175e3b69f -SHA1 (patch-ac) = 16fc33898fc1cb10b3e11ee26e7ea046d1f68032 -SHA1 (patch-ad) = 5c834eceaea7cef2ae964bba586c1e90ea4d0684 -SHA1 (patch-ae) = 8331a216051cd1bbfbeee7d2b54ab9e51be6f38d -SHA1 (patch-af) = f24e32ffa74ba14717c8e779a282803734e6fb17 -SHA1 (patch-ag) = 387e1f3f96f53a1afe21ab3a419b729125f269fb -SHA1 (patch-ah) = 37df772bd4c818eb2dd567169598436467ea4f1c -SHA1 (patch-ai) = 33e6c261933028472ce722b086280518cd1ac915 -SHA1 (patch-aj) = 107cbe0e9756818ae2529cc4791d7cd06d476a7c -SHA1 (patch-ak) = 123b32f70b0feb91bb3e0c2ca8e705ff2ae381bf -SHA1 (patch-al) = cf05f283c7676c9fa51b822f5ced66524dfa487e -SHA1 (patch-am) = 44180cb58cba4b5cc5663acc0215978001f82fa0 -SHA1 (patch-an) = ec341ab166c5ce98d1d0ba13b676646af50f7038 -SHA1 (patch-ao) = c4d76635d1a79ede36dfa9f11e4dc0922b1f461a diff --git a/graphics/gdk-pixbuf/patches/patch-aa b/graphics/gdk-pixbuf/patches/patch-aa deleted file mode 100644 index 04ea374aa61..00000000000 --- a/graphics/gdk-pixbuf/patches/patch-aa +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-aa,v 1.6 2002/10/20 22:36:46 bouyer Exp $ - -This is to work-around the following error, reported in PR pkg/17553: - -cc -DHAVE_CONFIG_H -I. -I. -I../.. -I/t/pkgobj/graphics/gdk-pixbuf/work.m68k/.buildlink/include/glib/glib-1.2 -I/t/pkgobj/graphics/gdk-pixbuf/work.m68k/.buildlink/lib/glib/include -I/t/pkgobj/graphics/gdk-pixbuf/work.m68k/.buildlink/include/gtk-1.2 -I/t/pkgobj/graphics/gdk-pixbuf/work.m68k/.buildlink/include/glib/glib-1.2 -I/t/pkgobj/graphics/gdk-pixbuf/work.m68k/.buildlink/lib/glib/include -I/usr/pkg/share/x11-links/include -I../../gdk-pixbuf -I/t/pkgobj/graphics/gdk-pixbuf/work.m68k/.buildlink/include -I/usr/pkg/share/x11-links/include -I/t/pkgobj/graphics/gdk-pixbuf/work.m68k/.buildlink/include -O2 -I/usr/pkg/share/x11-links/include -c pixops.c -fPIC -DPIC -o .libs/pixops.o -pixops.c: In function `bilinear_quadrant': -pixops.c:1349: internal error--unrecognizable insn: -(insn 204 56 58 (set (reg:DF 17 %fp1) - (const_double:DF (mem/u:DF (symbol_ref/u:SI ("*.LC10")) 0) 0 [0x0] 0 [0x0] 0 [0x0])) -1 (nil) - (nil)) -gmake[3]: *** [pixops.lo] Error 1 -gmake[3]: Leaving directory `/t/pkgobj/graphics/gdk-pixbuf/work.m68k/gdk-pixbuf-0.17.0/gdk-pixbuf/pixops' -[and so on] - ---- gdk-pixbuf/pixops/Makefile.am.orig Mon Oct 21 00:23:25 2002 -+++ gdk-pixbuf/pixops/Makefile.am Mon Oct 21 00:26:28 2002 -@@ -7,6 +7,15 @@ - timescale_SOURCES = timescale.c - timescale_LDADD = libpixops.la $(GLIB_LIBS) -lm - -+ifeq (m68k,$(findstring m68k,$(host_alias))) -+pixops.o: pixops.c -+ $(COMPILE) -O -c $< -+ -+pixops.lo: pixops.c -+ $(LIBTOOL) --mode=compile $(COMPILE) -O -c $< -+ -+ endif -+ - if USE_MMX - mmx_sources = \ - have_mmx.S \ diff --git a/graphics/gdk-pixbuf/patches/patch-ab b/graphics/gdk-pixbuf/patches/patch-ab deleted file mode 100644 index 5a6629778ce..00000000000 --- a/graphics/gdk-pixbuf/patches/patch-ab +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2003/01/15 21:03:26 wiz Exp $ - ---- configure.in.orig Thu Apr 18 18:48:40 2002 -+++ configure.in -@@ -128,6 +128,7 @@ - dnl Check for location of rgb.txt file (works without, but better with) - AC_MSG_CHECKING([for location of rgb.txt database]) - -+if test -z "$path_rgb_txt"; then - dnl default to this.. - path_rgb_txt=/usr/lib/X11/rgb.txt - -@@ -140,6 +141,7 @@ - break - fi - done -+fi - fi - AC_MSG_RESULT([$path_rgb_txt]) - AC_DEFINE_UNQUOTED(PATH_RGB_TXT,"$path_rgb_txt") diff --git a/graphics/gdk-pixbuf/patches/patch-ac b/graphics/gdk-pixbuf/patches/patch-ac deleted file mode 100644 index 18425e05d97..00000000000 --- a/graphics/gdk-pixbuf/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2002/08/25 18:39:05 jlam Exp $ - ---- gdk-pixbuf-config.in.orig Thu Oct 25 04:00:14 2001 -+++ gdk-pixbuf-config.in -@@ -44,7 +44,7 @@ - ;; - --libs) - libdirs=-L@libdir@ -- echo $libdirs -lgdk_pixbuf `gtk-config --libs` -+ echo $libdirs -lgdk_pixbuf `gtk-config --libs` @LIBTIFF@ @LIBJPEG@ @LIBPNG@ - ;; - *) - echo "${usage}" 1>&2 diff --git a/graphics/gdk-pixbuf/patches/patch-ad b/graphics/gdk-pixbuf/patches/patch-ad deleted file mode 100644 index 5cc2563e41d..00000000000 --- a/graphics/gdk-pixbuf/patches/patch-ad +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ad,v 1.5 2003/01/15 21:03:26 wiz Exp $ - ---- gdk-pixbuf/pixops/Makefile.in.orig Wed Dec 18 23:19:33 2002 -+++ gdk-pixbuf/pixops/Makefile.in -@@ -381,6 +372,15 @@ all-redirect all-am all installdirs most - distclean-generic clean-generic maintainer-clean-generic clean \ - mostlyclean distclean maintainer-clean - -+ -+ifeq (m68k,$(findstring m68k,$(host_alias))) -+pixops.o: pixops.c -+ $(COMPILE) -O -c $< -+ -+pixops.lo: pixops.c -+ $(LIBTOOL) --mode=compile $(COMPILE) -O -c $< -+ -+ endif - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/graphics/gdk-pixbuf/patches/patch-ae b/graphics/gdk-pixbuf/patches/patch-ae deleted file mode 100644 index 2fd6d3e821f..00000000000 --- a/graphics/gdk-pixbuf/patches/patch-ae +++ /dev/null @@ -1,56 +0,0 @@ -$NetBSD: patch-ae,v 1.5 2005/09/04 04:56:40 reed Exp $ - ---- configure.orig 2002-12-18 22:18:48.000000000 +0000 -+++ configure -@@ -2440,13 +2440,13 @@ darwin* | rhapsody*) - esac - ;; - --freebsd*) -+freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. -- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library' -+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; -@@ -4424,7 +4424,7 @@ else - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd*) -+ freebsd* | dragonfly*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes -@@ -4871,7 +4871,7 @@ freebsd1*) - dynamic_linker=no - ;; - --freebsd*) -+freebsd* | dragonfly*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` - version_type=freebsd-$objformat - case $version_type in -@@ -9214,6 +9214,7 @@ fi - echo "$as_me:9214: checking for location of rgb.txt database" >&5 - echo $ECHO_N "checking for location of rgb.txt database... $ECHO_C" >&6 - -+if test -z "$path_rgb_txt"; then - path_rgb_txt=/usr/lib/X11/rgb.txt - - if test -r ${x_libraries}/X11/rgb.txt; then -@@ -9226,7 +9227,8 @@ else - fi - done - fi --echo "$as_me:9229: result: $path_rgb_txt" >&5 -+fi -+echo "$as_me:$LINENO: result: $path_rgb_txt" >&5 - echo "${ECHO_T}$path_rgb_txt" >&6 - cat >>confdefs.h <<EOF - #define PATH_RGB_TXT "$path_rgb_txt" diff --git a/graphics/gdk-pixbuf/patches/patch-af b/graphics/gdk-pixbuf/patches/patch-af deleted file mode 100644 index 7769945abb9..00000000000 --- a/graphics/gdk-pixbuf/patches/patch-af +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-af,v 1.2 2011/08/03 10:01:25 drochner Exp $ - ---- gdk-pixbuf/io-gif.c.orig 2002-12-18 19:49:01.000000000 +0000 -+++ gdk-pixbuf/io-gif.c -@@ -617,7 +617,7 @@ clip_frame (GifContext *context, int *x, - *w = MIN (context->width, context->x_offset + context->frame_len) - *x; - *h = MIN (context->height, context->y_offset + context->frame_height) - *y; - -- if (w > 0 && h > 0) -+ if (*w > 0 && *h > 0) - return; - - /* The frame is completely off-bounds */ -@@ -944,6 +944,10 @@ gif_prepare_lzw (GifContext *context) - return -1; - } - -+ if (context->lzw_set_code_size > MAX_LZW_BITS) { -+ return -1; -+ } -+ - context->lzw_code_size = context->lzw_set_code_size + 1; - context->lzw_clear_code = 1 << context->lzw_set_code_size; - context->lzw_end_code = context->lzw_clear_code + 1; diff --git a/graphics/gdk-pixbuf/patches/patch-ag b/graphics/gdk-pixbuf/patches/patch-ag deleted file mode 100644 index d9eba7ddf6c..00000000000 --- a/graphics/gdk-pixbuf/patches/patch-ag +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2009/01/20 21:27:51 sketch Exp $ - ---- gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S.orig Wed Jan 23 00:37:47 2002 -+++ gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S Tue Jan 20 21:18:48 2009 -@@ -3,6 +3,9 @@ - gcc2_compiled.: - .text - .align 16 -+#ifdef __INTERIX -+#define pixops_composite_line_22_4a4_mmx _pixops_composite_line_22_4a4_mmx -+#endif - .globl pixops_composite_line_22_4a4_mmx - .type pixops_composite_line_22_4a4_mmx,@function - /* -@@ -156,8 +159,8 @@ - - shll $2, %edx - --# %mm4 will always be already clear here --# pxor %mm4, %mm4 -+/* %mm4 will always be already clear here -+ pxor %mm4, %mm4 */ - - movl 16(%ebp),%edi - movl (%edi, %edx), %eax diff --git a/graphics/gdk-pixbuf/patches/patch-ah b/graphics/gdk-pixbuf/patches/patch-ah deleted file mode 100644 index 2cff74f4ee3..00000000000 --- a/graphics/gdk-pixbuf/patches/patch-ah +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2005/01/25 04:58:01 tv Exp $ - ---- gdk-pixbuf/pixops/composite_line_color_22_4a4_mmx.S.orig 2005-01-24 23:54:16.000000000 -0500 -+++ gdk-pixbuf/pixops/composite_line_color_22_4a4_mmx.S -@@ -3,6 +3,9 @@ - gcc2_compiled.: - .text - .align 16 -+#ifdef __INTERIX -+#define pixops_composite_line_color_22_4a4_mmx _pixops_composite_line_color_22_4a4_mmx -+#endif - .globl pixops_composite_line_color_22_4a4_mmx - .type pixops_composite_line_color_22_4a4_mmx,@function - /* diff --git a/graphics/gdk-pixbuf/patches/patch-ai b/graphics/gdk-pixbuf/patches/patch-ai deleted file mode 100644 index 30ccef1640b..00000000000 --- a/graphics/gdk-pixbuf/patches/patch-ai +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ai,v 1.2 2009/01/20 21:27:51 sketch Exp $ - ---- gdk-pixbuf/pixops/have_mmx.S.orig Wed Jan 23 00:37:47 2002 -+++ gdk-pixbuf/pixops/have_mmx.S Tue Jan 20 21:21:54 2009 -@@ -3,6 +3,9 @@ - gcc2_compiled.: - .text - .align 16 -+#ifdef __INTERIX -+#define pixops_have_mmx _pixops_have_mmx -+#endif - .globl pixops_have_mmx - .type pixops_have_mmx,@function - -@@ -9,7 +12,7 @@ - pixops_have_mmx: - push %ebx - --# Check if bit 21 in flags word is writeable -+/* Check if bit 21 in flags word is writeable */ - - pushfl - popl %eax -@@ -24,7 +27,7 @@ - - je .notfound - --# OK, we have CPUID -+/* OK, we have CPUID */ - - movl $1, %eax - cpuid diff --git a/graphics/gdk-pixbuf/patches/patch-aj b/graphics/gdk-pixbuf/patches/patch-aj deleted file mode 100644 index 313d0e0fc3c..00000000000 --- a/graphics/gdk-pixbuf/patches/patch-aj +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2005/01/25 04:58:01 tv Exp $ - ---- gdk-pixbuf/pixops/scale_line_22_33_mmx.S.orig 2005-01-24 23:54:16.000000000 -0500 -+++ gdk-pixbuf/pixops/scale_line_22_33_mmx.S -@@ -3,6 +3,9 @@ - gcc2_compiled.: - .text - .align 16 -+#ifdef __INTERIX -+#define pixops_scale_line_22_33_mmx _pixops_scale_line_22_33_mmx -+#endif - .globl pixops_scale_line_22_33_mmx - .type pixops_scale_line_22_33_mmx,@function - /* diff --git a/graphics/gdk-pixbuf/patches/patch-ak b/graphics/gdk-pixbuf/patches/patch-ak deleted file mode 100644 index 3dbfa06cdf9..00000000000 --- a/graphics/gdk-pixbuf/patches/patch-ak +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ak,v 1.1 2005/04/01 11:37:23 salo Exp $ - ---- gdk-pixbuf/io-bmp.c.orig 2002-09-27 23:12:40.000000000 +0200 -+++ gdk-pixbuf/io-bmp.c 2005-04-01 13:05:14.000000000 +0200 -@@ -245,7 +245,14 @@ - static gboolean - grow_buffer (struct bmp_progressive_state *State) - { -- guchar *tmp = realloc (State->buff, State->BufferSize); -+ guchar *tmp; -+ -+ if (State->BufferSize == 0) { -+ State->read_state = READ_STATE_ERROR; -+ return FALSE; -+ } -+ -+ tmp = realloc (State->buff, State->BufferSize); - if (!tmp) { - State->read_state = READ_STATE_ERROR; - return FALSE; diff --git a/graphics/gdk-pixbuf/patches/patch-al b/graphics/gdk-pixbuf/patches/patch-al deleted file mode 100644 index 1a45ae3324b..00000000000 --- a/graphics/gdk-pixbuf/patches/patch-al +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-al,v 1.1 2005/04/27 11:05:42 wiz Exp $ - ---- gdk-pixbuf.m4.orig 2001-02-22 23:57:21.000000000 +0100 -+++ gdk-pixbuf.m4 -@@ -9,7 +9,7 @@ - dnl AM_PATH_GDK_PIXBUF([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) - dnl Test for GDK_PIXBUF, and define GDK_PIXBUF_CFLAGS and GDK_PIXBUF_LIBS - dnl --AC_DEFUN(AM_PATH_GDK_PIXBUF, -+AC_DEFUN([AM_PATH_GDK_PIXBUF], - [dnl - dnl Get the cflags and libraries from the gdk-pixbuf-config script - dnl diff --git a/graphics/gdk-pixbuf/patches/patch-am b/graphics/gdk-pixbuf/patches/patch-am deleted file mode 100644 index b02eab7dd36..00000000000 --- a/graphics/gdk-pixbuf/patches/patch-am +++ /dev/null @@ -1,121 +0,0 @@ -$NetBSD: patch-am,v 1.1 2005/11/26 09:40:49 salo Exp $ - -Security fixes for CVE-2005-2975, CVE-2005-2976 and CVE-2005-3186. - ---- gdk-pixbuf/io-xpm.c.orig 2001-03-01 21:16:28.000000000 +0100 -+++ gdk-pixbuf/io-xpm.c 2005-11-26 10:22:24.000000000 +0100 -@@ -243,8 +243,8 @@ xpm_extract_color (const gchar *buffer) - break; - else { - if (numnames > 0) { -- space -= 1; -- strcat (color, " "); -+ strncat (color, " ", space); -+ space -= MIN (space, 1); - } - - strncat (color, temp, space); -@@ -281,7 +281,8 @@ file_buffer (enum buf_op op, gpointer ha - /* Fall through to the xpm_read_string. */ - - case op_body: -- xpm_read_string (h->infile, &h->buffer, &h->buffer_size); -+ if(!xpm_read_string (h->infile, &h->buffer, &h->buffer_size)) -+ return NULL; - return h->buffer; - - default: -@@ -317,13 +318,6 @@ mem_buffer (enum buf_op op, gpointer han - return NULL; - } - --/* Destroy notification function for the pixbuf */ --static void --free_buffer (guchar *pixels, gpointer data) --{ -- free (pixels); --} -- - static gboolean - xpm_color_parse (const char *spec, XColor *color) - { -@@ -342,7 +336,8 @@ pixbuf_create_from_xpm (const gchar * (* - gchar pixel_str[32]; - GHashTable *color_hash; - _XPMColor *colors, *color, *fallbackcolor; -- guchar *pixels, *pixtmp; -+ guchar *pixtmp; -+ GdkPixbuf* pixbuf; - - fallbackcolor = NULL; - -@@ -352,17 +347,31 @@ pixbuf_create_from_xpm (const gchar * (* - return NULL; - } - sscanf (buffer, "%d %d %d %d", &w, &h, &n_col, &cpp); -- if (cpp >= 32) { -+ if (cpp <= 0 || cpp >= 32) { - g_warning ("XPM has more than 31 chars per pixel."); - return NULL; - } -+ if (n_col <= 0 || n_col >= G_MAXINT / (cpp + 1) || -+ n_col >= G_MAXINT / sizeof (_XPMColor)) { -+ g_warning ("XPM file has invalid number of colors."); -+ return NULL; -+ } - - /* The hash is used for fast lookups of color from chars */ - color_hash = g_hash_table_new (g_str_hash, g_str_equal); - - name_buf = g_new (gchar, n_col * (cpp + 1)); -- colors = g_new (_XPMColor, n_col); -- -+ if (!name_buf) { -+ g_warning ("Cannot allocate memory for loading XPM image."); -+ g_hash_table_destroy (color_hash); -+ return NULL; -+ } -+ colors = (_XPMColor *) g_malloc (sizeof (_XPMColor) * n_col); -+ if (!colors) { -+ g_warning ("Cannot allocate memory for loading XPM image."); -+ g_hash_table_destroy (color_hash); -+ return NULL; -+ } - for (cnt = 0; cnt < n_col; cnt++) { - gchar *color_name; - -@@ -397,12 +406,8 @@ pixbuf_create_from_xpm (const gchar * (* - fallbackcolor = color; - } - -- if (is_trans) -- pixels = malloc (w * h * 4); -- else -- pixels = malloc (w * h * 3); -- -- if (!pixels) { -+ pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, is_trans, 8, w, h); -+ if (!pixbuf) { - g_hash_table_destroy (color_hash); - g_free (colors); - g_free (name_buf); -@@ -410,7 +415,7 @@ pixbuf_create_from_xpm (const gchar * (* - } - - wbytes = w * cpp; -- pixtmp = pixels; -+ pixtmp = pixbuf->pixels; - - for (ycnt = 0; ycnt < h; ycnt++) { - buffer = (*get_buf) (op_body, handle); -@@ -443,9 +448,7 @@ pixbuf_create_from_xpm (const gchar * (* - g_free (colors); - g_free (name_buf); - -- return gdk_pixbuf_new_from_data (pixels, GDK_COLORSPACE_RGB, is_trans, 8, -- w, h, is_trans ? (w * 4) : (w * 3), -- free_buffer, NULL); -+ return pixbuf; - } - - /* Shared library entry point for file loading */ diff --git a/graphics/gdk-pixbuf/patches/patch-an b/graphics/gdk-pixbuf/patches/patch-an deleted file mode 100644 index 2242e9c8595..00000000000 --- a/graphics/gdk-pixbuf/patches/patch-an +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-an,v 1.1 2011/01/19 12:45:23 ryoon Exp $ - ---- gdk-pixbuf/io-png.c.orig 2001-01-24 20:59:23.000000000 +0000 -+++ gdk-pixbuf/io-png.c -@@ -175,7 +175,7 @@ gdk_pixbuf__png_image_load (FILE *f) - return NULL; - } - -- if (setjmp (png_ptr->jmpbuf)) { -+ if (setjmp (png_jmpbuf(png_ptr))) { - png_destroy_read_struct (&png_ptr, &info_ptr, &end_info); - return NULL; - } -@@ -311,7 +311,7 @@ gdk_pixbuf__png_image_begin_load (Module - return NULL; - } - -- if (setjmp (lc->png_read_ptr->jmpbuf)) { -+ if (setjmp (png_jmpbuf(lc->png_read_ptr))) { - if (lc->png_info_ptr) - png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL); - g_free(lc); -@@ -366,7 +366,7 @@ gdk_pixbuf__png_image_load_increment(gpo - lc->max_row_seen_in_chunk = -1; - - /* Invokes our callbacks as needed */ -- if (setjmp (lc->png_read_ptr->jmpbuf)) { -+ if (setjmp (png_jmpbuf(lc->png_read_ptr))) { - return FALSE; - } else { - png_process_data(lc->png_read_ptr, lc->png_info_ptr, buf, size); diff --git a/graphics/gdk-pixbuf/patches/patch-ao b/graphics/gdk-pixbuf/patches/patch-ao deleted file mode 100644 index be27cc78662..00000000000 --- a/graphics/gdk-pixbuf/patches/patch-ao +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2012/05/25 08:31:35 he Exp $ - -Add fix for http://secunia.com/advisories/49125/, taken from -http://bugzilla-attachments.gnome.org/attachment.cgi?id=212053. - ---- gdk-pixbuf/io-xbm.c.orig 2001-01-21 04:13:40.000000000 +0000 -+++ gdk-pixbuf/io-xbm.c -@@ -177,10 +177,16 @@ read_bitmap_file_data (FILE *fstream, - type++; - } - -- if (!strcmp ("width", type)) -+ if (!strcmp ("width", type)) { -+ if (value <= 0) -+ RETURN (FALSE); - ww = (unsigned int) value; -- if (!strcmp ("height", type)) -+ } -+ if (!strcmp ("height", type)) { -+ if (value <= 0) -+ RETURN (FALSE); - hh = (unsigned int) value; -+ } - if (!strcmp ("hot", type)) { - if (type-- == name_and_type - || type-- == name_and_type) -@@ -221,6 +227,8 @@ read_bitmap_file_data (FILE *fstream, - bytes_per_line = (ww+7)/8 + padding; - - size = bytes_per_line * hh; -+ if (size / bytes_per_line != hh) /* overflow */ -+ RETURN (FALSE); - bits = g_malloc (size); - - if (version10p) { diff --git a/x11/Makefile b/x11/Makefile index 6acdf8f957b..1560d0d19e8 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.840 2019/07/19 21:15:16 wiz Exp $ +# $NetBSD: Makefile,v 1.841 2019/07/21 10:34:52 wiz Exp $ # COMMENT= Packages to support the X window system @@ -628,7 +628,6 @@ SUBDIR+= xmascot SUBDIR+= xmessage SUBDIR+= xmh SUBDIR+= xmindpath -SUBDIR+= xmms-osd SUBDIR+= xmodmap SUBDIR+= xmon SUBDIR+= xmore diff --git a/x11/xmms-osd/DESCR b/x11/xmms-osd/DESCR deleted file mode 100644 index 0e63e4926e7..00000000000 --- a/x11/xmms-osd/DESCR +++ /dev/null @@ -1,3 +0,0 @@ -xmms-osd provides the example XMMS plugin contained within the xosd -distribution file. This plugin shows XMMS status directly on your -X desktop, like song, volume and balance changes, etc. diff --git a/x11/xmms-osd/Makefile b/x11/xmms-osd/Makefile deleted file mode 100644 index fe90b73d598..00000000000 --- a/x11/xmms-osd/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# $NetBSD: Makefile,v 1.29 2016/08/03 10:23:40 adam Exp $ -# - -.include "../../x11/xosd/Makefile.common" - -PKGNAME= ${DISTNAME:S/xosd/xmms-osd/} -PKGREVISION= 12 - -COMMENT= XMMS plugin that shows current status on your desktop -CONFLICTS= xosd<=2.2.0 - -CONFIGURE_ENV+= XOSD_XMMS_PLUGIN=YES -CONFIGURE_ARGS+= --enable-new-plugin - -BUILD_DIRS= src/xmms_plugin -INSTALL_DIRS= src/xmms_plugin - -.include "../../audio/xmms/buildlink3.mk" -.include "../../graphics/gdk-pixbuf/buildlink3.mk" -.include "../../x11/gtk/buildlink3.mk" -.include "../../x11/libXi/buildlink3.mk" -.include "../../x11/xosd/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/x11/xmms-osd/PLIST b/x11/xmms-osd/PLIST deleted file mode 100644 index 63c062a3c71..00000000000 --- a/x11/xmms-osd/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:25:17 joerg Exp $ -lib/xmms/General/libxmms_osd.la diff --git a/x11/xosd/Makefile.common b/x11/xosd/Makefile.common index 2735474d1aa..180c78f3007 100644 --- a/x11/xosd/Makefile.common +++ b/x11/xosd/Makefile.common @@ -1,6 +1,4 @@ -# $NetBSD: Makefile.common,v 1.29 2018/07/04 13:40:44 jperkin Exp $ -# -# used by x11/xmms-osd/Makefile +# $NetBSD: Makefile.common,v 1.30 2019/07/21 10:34:52 wiz Exp $ DISTNAME= xosd-2.2.14 CATEGORIES= x11 |