pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net/jigdo
Module Name: pkgsrc
Committed By: bsiegert
Date: Sat Jan 3 18:13:23 UTC 2026
Modified Files:
pkgsrc/net/jigdo: Makefile PLIST distinfo
Added Files:
pkgsrc/net/jigdo: options.mk
pkgsrc/net/jigdo/files: interface.hh
pkgsrc/net/jigdo/patches: patch-Makefile.in patch-doc_jigdo-file.sgml
patch-src_Makefile.in patch-src_net_proxyguess.cc
Removed Files:
pkgsrc/net/jigdo/patches: patch-src_compat.hh
patch-src_gtk_gtk-single-url.cc patch-src_gtk_jigdo.cc
patch-src_recursedir.cc patch-src_util_configfile.cc
patch-src_util_md5sum.hh patch-src_util_string-utf.cc
Log Message:
jigdo: update to 0.8.2
Upstream says that this mainly contains bugfixes.
Also add a "gtk" option which is on by default. If you disable it, it
disables the GUI. This addresses PR pkg/30837, only 21 years later.
We keep a copy of the old interface.hh from 0.7.3 in FILESDIR; the build
now wants to regenerate it with glade-2, which is long gone from pkgsrc.
To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 pkgsrc/net/jigdo/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/jigdo/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/jigdo/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/jigdo/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/net/jigdo/files/interface.hh
cvs rdiff -u -r0 -r1.1 pkgsrc/net/jigdo/patches/patch-Makefile.in \
pkgsrc/net/jigdo/patches/patch-doc_jigdo-file.sgml \
pkgsrc/net/jigdo/patches/patch-src_Makefile.in \
pkgsrc/net/jigdo/patches/patch-src_net_proxyguess.cc
cvs rdiff -u -r1.1 -r0 pkgsrc/net/jigdo/patches/patch-src_compat.hh \
pkgsrc/net/jigdo/patches/patch-src_gtk_gtk-single-url.cc \
pkgsrc/net/jigdo/patches/patch-src_gtk_jigdo.cc \
pkgsrc/net/jigdo/patches/patch-src_recursedir.cc \
pkgsrc/net/jigdo/patches/patch-src_util_configfile.cc \
pkgsrc/net/jigdo/patches/patch-src_util_md5sum.hh \
pkgsrc/net/jigdo/patches/patch-src_util_string-utf.cc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/net/jigdo/Makefile
diff -u pkgsrc/net/jigdo/Makefile:1.106 pkgsrc/net/jigdo/Makefile:1.107
--- pkgsrc/net/jigdo/Makefile:1.106 Thu Jan 1 09:30:40 2026
+++ pkgsrc/net/jigdo/Makefile Sat Jan 3 18:13:22 2026
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.106 2026/01/01 09:30:40 wiz Exp $
+# $NetBSD: Makefile,v 1.107 2026/01/03 18:13:22 bsiegert Exp $
-DISTNAME= jigdo-0.7.3
-PKGREVISION= 81
+DISTNAME= jigdo-0.8.2
CATEGORIES= net
-#MASTER_SITES= http://atterer.org/sites/atterer/files/2009-08/jigdo/
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES= https://www.einval.com/~steve/software/jigdo/download/
+EXTRACT_SUFX= .tar.xz
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://www.einval.com/~steve/software/jigdo/
@@ -19,10 +18,13 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-libdb
BROKEN_GETTEXT_DETECTION= yes
-#.include "../../databases/db3/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
+pre-build:
+ ${CP} ${FILESDIR}/interface.hh ${WRKSRC}/src/gtk
+
+.include "options.mk"
+
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../www/libwww/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../textproc/docbook-utils/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/jigdo/PLIST
diff -u pkgsrc/net/jigdo/PLIST:1.3 pkgsrc/net/jigdo/PLIST:1.4
--- pkgsrc/net/jigdo/PLIST:1.3 Sun Jun 14 18:09:31 2009
+++ pkgsrc/net/jigdo/PLIST Sat Jan 3 18:13:22 2026
@@ -1,19 +1,18 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:09:31 joerg Exp $
-bin/jigdo
+@comment $NetBSD: PLIST,v 1.4 2026/01/03 18:13:22 bsiegert Exp $
+${PLIST.gtk}bin/jigdo
bin/jigdo-file
bin/jigdo-lite
bin/jigdo-mirror
man/man1/jigdo-file.1
man/man1/jigdo-lite.1
man/man1/jigdo-mirror.1
-man/man1/jigdo.1
-share/jigdo/COPYING
+${PLIST.gtk}share/jigdo/COPYING
share/jigdo/debian-mirrors.jigdo
-share/jigdo/pixmaps/close.png
-share/jigdo/pixmaps/jigdo-logo.png
-share/jigdo/pixmaps/pause.png
-share/jigdo/pixmaps/progress-green.png
-share/jigdo/pixmaps/restart.png
-share/jigdo/pixmaps/start.png
-share/jigdo/pixmaps/stop.png
+${PLIST.gtk}share/jigdo/pixmaps/close.png
+${PLIST.gtk}share/jigdo/pixmaps/jigdo-logo.png
+${PLIST.gtk}share/jigdo/pixmaps/pause.png
+${PLIST.gtk}share/jigdo/pixmaps/progress-green.png
+${PLIST.gtk}share/jigdo/pixmaps/restart.png
+${PLIST.gtk}share/jigdo/pixmaps/start.png
+${PLIST.gtk}share/jigdo/pixmaps/stop.png
share/locale/de/LC_MESSAGES/jigdo.mo
Index: pkgsrc/net/jigdo/distinfo
diff -u pkgsrc/net/jigdo/distinfo:1.9 pkgsrc/net/jigdo/distinfo:1.10
--- pkgsrc/net/jigdo/distinfo:1.9 Tue Oct 26 11:05:49 2021
+++ pkgsrc/net/jigdo/distinfo Sat Jan 3 18:13:22 2026
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 11:05:49 nia Exp $
+$NetBSD: distinfo,v 1.10 2026/01/03 18:13:22 bsiegert Exp $
-BLAKE2s (jigdo-0.7.3.tar.bz2) = 1d3be96235c2df59b829eb70176d91e11157fa7d5cf91160766762408b404382
-SHA512 (jigdo-0.7.3.tar.bz2) = e183a2d93126935057244b9eb6bf6dadc1900cb17c36194f69e63a15d70ddfea81ce1167de5abfcdfd7507ac9fe6250a05be9d9d29392c961d44fde796158f7c
-Size (jigdo-0.7.3.tar.bz2) = 644670 bytes
-SHA1 (patch-src_compat.hh) = 41a7a5e01453a9e2ababfa8862934b479d068484
-SHA1 (patch-src_gtk_gtk-single-url.cc) = ea2a2515fd5feef3e911e0ab1e794538be243341
-SHA1 (patch-src_gtk_jigdo.cc) = 46867a3f83cd45134f6b91766a9b6721bb5b342a
-SHA1 (patch-src_recursedir.cc) = b9b67ef698496470a7e36e95590f4fb8d0c86f8a
-SHA1 (patch-src_util_configfile.cc) = 1f280ba31a7ecba1b177f4c113df1b5cfb11b40d
-SHA1 (patch-src_util_md5sum.hh) = 9b18b5d619dc12fd0b6dd8ace6477c4c1f78f83a
-SHA1 (patch-src_util_string-utf.cc) = cef7c75d953b926ad9fc87e9051aa99084d034f4
+BLAKE2s (jigdo-0.8.2.tar.xz) = ecc5a203e4afb9f187b7f27f1b5482c0ba08f58a22217286ba2d6b75ebe61733
+SHA512 (jigdo-0.8.2.tar.xz) = 69197e6528c1b85b58b6e2e222b20973471909827ec8d1b6b35434c4c80c18c95f6ae816277853db5161b8b307bf9e25ce4fef91a91773a54eece541f0b19550
+Size (jigdo-0.8.2.tar.xz) = 576560 bytes
+SHA1 (patch-Makefile.in) = 7a9e11f53adf47c67b4dc7028e1dc1048653df7d
+SHA1 (patch-doc_jigdo-file.sgml) = 7a58e314eaf431690bfee10fccc01ece43be4dce
+SHA1 (patch-src_Makefile.in) = a76cda6309ea80fd87ca3464bb02f4e5e21cf410
+SHA1 (patch-src_net_proxyguess.cc) = 95eca64d254d9b2403c75feaecb389b742736c27
Added files:
Index: pkgsrc/net/jigdo/options.mk
diff -u /dev/null pkgsrc/net/jigdo/options.mk:1.1
--- /dev/null Sat Jan 3 18:13:23 2026
+++ pkgsrc/net/jigdo/options.mk Sat Jan 3 18:13:22 2026
@@ -0,0 +1,19 @@
+# $NetBSD: options.mk,v 1.1 2026/01/03 18:13:22 bsiegert Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.jigdo
+PKG_SUPPORTED_OPTIONS= gtk
+PKG_SUGGESTED_OPTIONS= gtk
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+= gtk
+
+.if !empty(PKG_OPTIONS:Mgtk)
+. include "../../databases/db4/buildlink3.mk"
+. include "../../www/libwww/buildlink3.mk"
+. include "../../x11/gtk2/buildlink3.mk"
+CONFIGURE_ARGS= --with-gui
+PLIST.gtk= yes
+.else
+CONFIGURE_ARGS+= --without-gui
+.endif
Index: pkgsrc/net/jigdo/files/interface.hh
diff -u /dev/null pkgsrc/net/jigdo/files/interface.hh:1.1
--- /dev/null Sat Jan 3 18:13:23 2026
+++ pkgsrc/net/jigdo/files/interface.hh Sat Jan 3 18:13:22 2026
@@ -0,0 +1,107 @@
+// Automatically created from `interface.cc.tmp' by glade-filter.awk
+
+#include <unistd-jigdo.h>
+#ifndef INTERFACE_HH
+#define INTERFACE_HH
+
+#include <config.h>
+#include <gtk/gtk.h>
+
+namespace GUI {
+
+ struct Window {
+ GtkWidget* create();
+ GtkWidget *window;
+ GtkWidget *windowVbox;
+ GtkWidget *toolbarHandle;
+ GtkWidget *toolbar;
+ GtkIconSize tmp_toolbar_icon_size;
+ GtkWidget *toolbarOpen;
+ GtkWidget *toolbarReuse;
+ GtkWidget *toolbarSettings;
+ GtkWidget *toolbarExit;
+ GtkWidget *windowPaned;
+ GtkWidget *invisibleNotebook;
+ GtkWidget *pageOpen;
+ GtkWidget *aboutJigdoLogo;
+ AtkObject *atko;
+ GtkWidget *aboutBgnd;
+ GtkWidget *aboutJigdoLabel;
+ GtkWidget *aboutJigdoButton;
+ GtkWidget *aboutJigdoButtonLabel;
+ GtkWidget *openButton;
+ GtkWidget *open_sourceURLLabel;
+ GtkWidget *open_destinationLabel;
+ GtkWidget *open_URL;
+ GtkWidget *open_dest;
+ GtkWidget *open_URLSel;
+ GtkWidget *open_destSel;
+ GtkWidget *enterUrlLabel;
+ GtkWidget *pageOpenLabel;
+ GtkWidget *pageReuse;
+ GtkWidget *reuse_path;
+ GtkWidget *reuse_pathSel;
+ GtkWidget *reuse_scanButton;
+ GtkWidget *reuse_clearButton;
+ GtkWidget *pageReuseLabel;
+ GtkWidget *pageDownload;
+ GtkWidget *download_buttonInfo;
+ GtkWidget *download_closeButton;
+ GtkWidget *download_restartButton;
+ GtkWidget *download_stopButton;
+ GtkWidget *download_pauseButton;
+ GtkWidget *download_startButton;
+ GtkWidget *download_dest;
+ GtkWidget *download_progress;
+ GtkWidget *download_status;
+ GtkWidget *download_URL;
+ GtkWidget *pageDownloadLabel;
+ GtkWidget *pageJigdo;
+ GtkWidget *jigdo_InfoVbox;
+ GtkWidget *jigdo_ShortInfo;
+ GtkWidget *jigdo_Info;
+ GSList *radiobutton1_group ;
+ GtkWidget *combo_entry1;
+ GtkWidget *combo_entry2;
+ GtkWidget *combo_entry3;
+ GtkWidget *jigdo_buttonInfo;
+ GtkWidget *jigdo_closeButton;
+ GtkWidget *jigdo_restartButton;
+ GtkWidget *jigdo_stopButton;
+ GtkWidget *jigdo_pauseButton;
+ GtkWidget *jigdo_startButton;
+ GtkWidget *jigdo_status;
+ GtkWidget *jigdo_progress;
+ GtkWidget *jigdo_dest;
+ GtkWidget *jigdo_URL;
+ GtkWidget *pageJigdoLabel;
+ GtkWidget *progressScroll;
+ GtkWidget *jobs;
+ GtkTooltips *tooltips;
+ };
+
+ struct Filesel {
+ GtkWidget* create();
+ GtkWidget *filesel;
+ GtkWidget *okButton;
+ GtkWidget *cancelButton;
+ };
+
+ struct Settings {
+ GtkWidget* create();
+ GtkWidget *settings;
+ GtkObject *spinbutton2_adj;
+ GtkObject *spinbutton3_adj;
+ GtkTooltips *tooltips;
+ };
+
+ struct License {
+ GtkWidget* create();
+ GtkWidget *license;
+ GtkWidget *licenseScroll;
+ GtkWidget *licenseText;
+ };
+
+} // namespace GUI
+
+#endif /* INTERFACE_HH */
Index: pkgsrc/net/jigdo/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/net/jigdo/patches/patch-Makefile.in:1.1
--- /dev/null Sat Jan 3 18:13:23 2026
+++ pkgsrc/net/jigdo/patches/patch-Makefile.in Sat Jan 3 18:13:22 2026
@@ -0,0 +1,17 @@
+$NetBSD: patch-Makefile.in,v 1.1 2026/01/03 18:13:22 bsiegert Exp $
+
+Do not try to install non-existing jigdo.1
+
+--- Makefile.in.orig 2026-01-03 17:23:16.378060074 +0000
++++ Makefile.in
+@@ -108,10 +108,6 @@ install-jigdo:
+ $(INSTALL_DATA) "$(srcdir)/gfx/$$x" \
+ "$(DESTDIR)$(datadir)/jigdo/pixmaps" || exit 1; \
+ done
+- $(INSTALL) -d $(DESTDIR)$(mandir)/man1
+- x="doc/jigdo.1"; \
+- test -f "$$x" || x="$(srcdir)/$$x"; \
+- $(INSTALL) "$$x" $(DESTDIR)$(mandir)/man1
+ $(INSTALL_DATA) "$(srcdir)/COPYING" \
+ "$(DESTDIR)$(datadir)/jigdo/COPYING"
+ install-po:
Index: pkgsrc/net/jigdo/patches/patch-doc_jigdo-file.sgml
diff -u /dev/null pkgsrc/net/jigdo/patches/patch-doc_jigdo-file.sgml:1.1
--- /dev/null Sat Jan 3 18:13:23 2026
+++ pkgsrc/net/jigdo/patches/patch-doc_jigdo-file.sgml Sat Jan 3 18:13:22 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-doc_jigdo-file.sgml,v 1.1 2026/01/03 18:13:22 bsiegert Exp $
+
+Correct syntax error (missing closing tag).
+
+--- doc/jigdo-file.sgml.orig 2023-08-03 19:55:46.000000000 +0000
++++ doc/jigdo-file.sgml
+@@ -1580,7 +1580,7 @@ Any text, except that lines must not beg
+ <para>Steve McIntyre <email>93sam%debian.org@localhost</email> picked up
+ later development of jigdo after Richard had moved on - see
+ the <ulink url="https://git.einval.com/cgi-bin/gitweb.cgi?p=jigdo.git;a=summary";>git
+- repo work</ulink> or packages in Debian for more recent releases.
++ repo work</ulink> or packages in Debian for more recent releases.</para>
+
+ </refsect1>
+ </refentry>
Index: pkgsrc/net/jigdo/patches/patch-src_Makefile.in
diff -u /dev/null pkgsrc/net/jigdo/patches/patch-src_Makefile.in:1.1
--- /dev/null Sat Jan 3 18:13:23 2026
+++ pkgsrc/net/jigdo/patches/patch-src_Makefile.in Sat Jan 3 18:13:22 2026
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2026/01/03 18:13:22 bsiegert Exp $
+
+Add missing include paths back; do not try to run glade-2.
+
+--- src/Makefile.in.orig 2023-08-03 19:55:46.000000000 +0000
++++ src/Makefile.in
+@@ -10,9 +10,7 @@ prefix = @prefix@
+ datadir = @datadir@
+
+ SUBDIRS = util # glibcurl gtk job net
+-SUBINCLUDE = -I"$(srcdir)/util"
+-
+-# -I"$(srcdir)/glibcurl" -I"$(srcdir)/gtk" -I"$(srcdir)/job" \
++SUBINCLUDE = -I"$(srcdir)/util" -I"$(srcdir)/glibcurl" -I"$(srcdir)/gtk" -I"$(srcdir)/job" \
+ -I"$(srcdir)/net"
+
+ # Prevent these variables from being taken from the environment
+@@ -240,15 +238,6 @@ logtest@exe@: util/debug.o util/log.o ut
+ $(LD) -o $@ util/log.o util/logtest.o util/string-utf.o \
+ util/debug.o $(LDFLAGS) $(GTKLIBS)
+
+-gtk/interface.cc gtk/interface.hh: $(srcdir)/../jigdo.glade \
+- $(srcdir)/../scripts/glade-filter.awk
+- cd $(srcdir)/.. \
+- && $(GLADECODE) "jigdo.glade"
+- $(AWK) -f "$(srcdir)/../scripts/glade-filter.awk" \
+- "$(srcdir)/gtk/interface"
+- -ln -sf "$(srcdir)/gtk/interface.cc" gtk/interface.cc
+- cd $(srcdir) && rm -f gtk/gui.cc.tmp gtk/gui.hh.tmp \
+- gtk/interface.cc.tmp gtk/interface.hh.tmp
+ #______________________________________________________________________
+
+ LDFLAGS_WINSOCK = @IF_WINDOWS@ -lws2_32
Index: pkgsrc/net/jigdo/patches/patch-src_net_proxyguess.cc
diff -u /dev/null pkgsrc/net/jigdo/patches/patch-src_net_proxyguess.cc:1.1
--- /dev/null Sat Jan 3 18:13:23 2026
+++ pkgsrc/net/jigdo/patches/patch-src_net_proxyguess.cc Sat Jan 3 18:13:23 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_net_proxyguess.cc,v 1.1 2026/01/03 18:13:23 bsiegert Exp $
+
+In C++17, a comparison function needs to be able to be called when
+const-qualified.
+
+--- src/net/proxyguess.cc.orig 2026-01-03 17:17:30.754018280 +0000
++++ src/net/proxyguess.cc
+@@ -214,7 +214,7 @@ namespace {
+
+ // Compare pointers to BrowserConfigs by comparing the objects' age
+ struct ConfFilesCompare {
+- bool operator()(const BrowserConfig* a, const BrowserConfig* b) {
++ bool operator()(const BrowserConfig* a, const BrowserConfig* b) const {
+ return a->age < b->age;
+ }
+ };
Home |
Main Index |
Thread Index |
Old Index