mirror of
https://github.com/yann64/haikuports.git
synced 2026-03-19 01:46:00 +01:00
jigdo, bump version (#9564)
This commit is contained in:
Schrijvers Luc
GitHub
@@ -4,12 +4,13 @@ distribution of very large files over the internet, for example CD or DVD \
|
||||
images. Its aim is to make downloading the images as easy for users as a click \
|
||||
on a direct download link in a browser, while avoiding all the problems that \
|
||||
server administrators have with hosting such large files."
|
||||
HOMEPAGE="http://atterer.org/jigdo/"
|
||||
COPYRIGHT="2001-2006 Richard Atterer"
|
||||
HOMEPAGE="https://www.einval.com/~steve/software/jigdo/"
|
||||
COPYRIGHT="2019-2023 Steve McIntyre
|
||||
2001-2006 Richard Atterer"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="http://atterer.org/sites/atterer/files/2009-08/jigdo/jigdo-$portVersion.tar.bz2"
|
||||
CHECKSUM_SHA256="875c069abad67ce67d032a9479228acdb37c8162236c0e768369505f264827f0"
|
||||
SOURCE_URI="https://www.einval.com/~steve/software/jigdo/download/jigdo-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="36f286d93fa6b6bf7885f4899c997894d21da3a62176592ac162d9c6a8644f9e"
|
||||
PATCHES="jigdo-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
@@ -33,7 +34,7 @@ REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
cmd:wget
|
||||
lib:libbz2$secondaryArchSuffix
|
||||
lib:libdb$secondaryArchSuffix
|
||||
lib:libdb_18.1$secondaryArchSuffix
|
||||
lib:libintl$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
@@ -41,8 +42,8 @@ REQUIRES="
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libbz2$secondaryArchSuffix
|
||||
devel:libdb$secondaryArchSuffix
|
||||
devel:libintl$secondaryArchSuffix
|
||||
devel:libcurl$secondaryArchSuffix
|
||||
devel:libdb_18.1$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
@@ -58,7 +59,7 @@ defineDebugInfoPackage jigdo$secondaryArchSuffix \
|
||||
BUILD()
|
||||
{
|
||||
runConfigure --omit-dirs "binDir docDir dataRootDir" ./configure \
|
||||
--bindir $commandBinDir --without-gtk
|
||||
--bindir $commandBinDir
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
@@ -1,58 +0,0 @@
|
||||
From 3226f395702e65af17db4c06348e68d088515ce7 Mon Sep 17 00:00:00 2001
|
||||
From: nys <33534144+nysnatuss@users.noreply.github.com>
|
||||
Date: Sun, 31 Dec 2017 00:25:20 +0000
|
||||
Subject: patch jigdo
|
||||
|
||||
|
||||
diff --git a/src/compat.hh b/src/compat.hh
|
||||
index 3a7ac9a..17c0887 100644
|
||||
--- a/src/compat.hh
|
||||
+++ b/src/compat.hh
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
#include <string>
|
||||
#include <stdio.h>
|
||||
+#include <cstdlib>
|
||||
#include <unistd-jigdo.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
diff --git a/src/recursedir.cc b/src/recursedir.cc
|
||||
index 794ece0..7134510 100644
|
||||
--- a/src/recursedir.cc
|
||||
+++ b/src/recursedir.cc
|
||||
@@ -37,6 +37,7 @@
|
||||
#include <sys/types.h>
|
||||
#include <unistd-jigdo.h>
|
||||
|
||||
+#include <cstring>
|
||||
#include <string.hh>
|
||||
//______________________________________________________________________
|
||||
|
||||
diff --git a/src/util/configfile.cc b/src/util/configfile.cc
|
||||
index 3a19cb2..568d70b 100644
|
||||
--- a/src/util/configfile.cc
|
||||
+++ b/src/util/configfile.cc
|
||||
@@ -18,6 +18,7 @@
|
||||
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
+#include <cstring>
|
||||
|
||||
#include <configfile.hh>
|
||||
#include <string.hh>
|
||||
diff --git a/src/util/md5sum.hh b/src/util/md5sum.hh
|
||||
index 793a5e2..fbfe226 100644
|
||||
--- a/src/util/md5sum.hh
|
||||
+++ b/src/util/md5sum.hh
|
||||
@@ -30,7 +30,7 @@
|
||||
|
||||
#include <cstdlib>
|
||||
#include <iosfwd>
|
||||
-#include <string>
|
||||
+#include <cstring>
|
||||
|
||||
#include <bstream.hh>
|
||||
#include <debug.hh>
|
||||
--
|
||||
2.15.0
|
||||
|
||||
114
app-misc/jigdo/patches/jigdo-0.8.2.patchset
Normal file
114
app-misc/jigdo/patches/jigdo-0.8.2.patchset
Normal file
@@ -0,0 +1,114 @@
|
||||
From 57d9457f0ede2eb83aea7e054836d0ccecb115e0 Mon Sep 17 00:00:00 2001
|
||||
From: nys <33534144+nysnatuss@users.noreply.github.com>
|
||||
Date: Sun, 31 Dec 2017 00:25:20 +0000
|
||||
Subject: patch jigdo
|
||||
|
||||
|
||||
diff --git a/src/compat.hh b/src/compat.hh
|
||||
index 36aa04e..3a7b55c 100644
|
||||
--- a/src/compat.hh
|
||||
+++ b/src/compat.hh
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
#include <string>
|
||||
#include <stdio.h>
|
||||
+#include <cstdlib>
|
||||
#include <stdlib.h>
|
||||
#include <unistd-jigdo.h>
|
||||
#include <sys/stat.h>
|
||||
diff --git a/src/recursedir.cc b/src/recursedir.cc
|
||||
index ed5423e..f8afb4c 100644
|
||||
--- a/src/recursedir.cc
|
||||
+++ b/src/recursedir.cc
|
||||
@@ -38,6 +38,7 @@
|
||||
#include <sys/types.h>
|
||||
#include <unistd-jigdo.h>
|
||||
|
||||
+#include <cstring>
|
||||
#include <string.hh>
|
||||
//______________________________________________________________________
|
||||
|
||||
diff --git a/src/util/md5sum.hh b/src/util/md5sum.hh
|
||||
index 827f5db..ab0076c 100644
|
||||
--- a/src/util/md5sum.hh
|
||||
+++ b/src/util/md5sum.hh
|
||||
@@ -34,7 +34,7 @@
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
#include <iosfwd>
|
||||
-#include <string>
|
||||
+#include <cstring>
|
||||
|
||||
#include <bstream.hh>
|
||||
#include <debug.hh>
|
||||
--
|
||||
2.37.3
|
||||
|
||||
|
||||
From 0677aaad367eadbd3a58b7cb270acb7af9b3f70e Mon Sep 17 00:00:00 2001
|
||||
From: Begasus <begasus@gmail.com>
|
||||
Date: Tue, 3 Oct 2023 15:58:33 +0200
|
||||
Subject: Disable building the documentation/manpages, requires doctool-utils
|
||||
(redundant)
|
||||
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 19cf258..4aa0298 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -30,10 +30,9 @@ catalogs = @CATALOGS@
|
||||
install-jigdo-file install-jigdo-lite install-jigdo \
|
||||
install-po
|
||||
# "gfx" symlink is needed for the pixmaps to be found by jigdo
|
||||
-all doc mostlyclean dep depend: Makefile
|
||||
+all mostlyclean dep depend: Makefile
|
||||
-test -h gfx -o -d gfx || ln -s "$(srcdir)/gfx" gfx
|
||||
cd src && $(MAKE) $@ EXTRA_CFLAGS="$(EXTRA_CFLAGS)" EXTRA_CXXFLAGS="$(EXTRA_CXXFLAGS)" EXTRA_LDFLAGS="$(EXTRA_LDFLAGS)"
|
||||
- cd doc && $(MAKE) $@
|
||||
cd po && $(MAKE) $@
|
||||
check test: Makefile
|
||||
-test -h gfx -o -d gfx || ln -s "$(srcdir)/gfx" gfx
|
||||
@@ -72,10 +71,6 @@ install: install-po install-jigdo-file install-jigdo-lite \
|
||||
install-jigdo-file:
|
||||
$(INSTALL) -d $(DESTDIR)$(bindir)
|
||||
$(INSTALL_EXE) src/jigdo-file $(DESTDIR)$(bindir)
|
||||
- $(INSTALL) -d $(DESTDIR)$(mandir)/man1
|
||||
- x="doc/jigdo-file.1"; \
|
||||
- test -f "$$x" || x="$(srcdir)/$$x"; \
|
||||
- $(INSTALL) "$$x" $(DESTDIR)$(mandir)/man1
|
||||
install-jigdo-lite:
|
||||
$(INSTALL) -d "$(DESTDIR)$(bindir)"
|
||||
$(INSTALL) -d "$(DESTDIR)$(datadir)/jigdo"
|
||||
@@ -86,18 +81,10 @@ install-jigdo-lite:
|
||||
>"$(DESTDIR)$(bindir)/jigdo-lite"
|
||||
$(INSTALL_DATA) "$(srcdir)/scripts/debian-mirrors.jigdo" \
|
||||
"$(DESTDIR)$(datadir)/jigdo"
|
||||
- $(INSTALL) -d $(DESTDIR)$(mandir)/man1
|
||||
- x="doc/jigdo-lite.1"; \
|
||||
- test -f "$$x" || x="$(srcdir)/$$x"; \
|
||||
- $(INSTALL) "$$x" $(DESTDIR)$(mandir)/man1
|
||||
install-jigdo-mirror:
|
||||
$(INSTALL) -d "$(DESTDIR)$(bindir)"
|
||||
$(INSTALL_SCRIPT) "$(srcdir)/scripts/jigdo-mirror" \
|
||||
"$(DESTDIR)$(bindir)"
|
||||
- $(INSTALL) -d $(DESTDIR)$(mandir)/man1
|
||||
- x="doc/jigdo-mirror.1"; \
|
||||
- test -f "$$x" || x="$(srcdir)/$$x"; \
|
||||
- $(INSTALL) "$$x" $(DESTDIR)$(mandir)/man1
|
||||
install-jigdo:
|
||||
$(INSTALL) -d "$(DESTDIR)$(bindir)"
|
||||
$(INSTALL_EXE) src/jigdo "$(DESTDIR)$(bindir)"
|
||||
@@ -108,10 +95,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:
|
||||
--
|
||||
2.37.3
|
||||
|
||||
Reference in New Issue
Block a user