Mercurial > mxe-octave

changeset 4618:de2eedecd6ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update broken PKG_UPDATE rules, handle missing update rules * Makefile.in: add handling for packages with no update rule * src/gtk2.mk, src/gtk3.mk, src/libvpx.mk, src/taglib.mk, src/hunspell.mk, src/vala.mk : use github tags for version info * src/llvm.mk: add '?' to update url * src/openscenegraph.mk: update SED rule for version extraction * src/pthread-stubs.mk, src/qt5.mk, src/renderproto.mk, src/sm.mk, src/s2tc.mk, src/util-macros.mk: added dummy PKG_UPDATE rule * src/qscintilla.mk: change search name for version extraction * src/qtbase.mk: use short pkg version in update path * src/suitesparse.mk: update change in main url/version url * src/tre.mk: update download page link * src/vmime.mk: update download and update url * src/wget.mk, src/xapian-core.mk: update url, sed rule * src/wt.mk: update to use github download/update * src/src-msys-libcrypt.mk: update sed rule
author John Donoghue
date Fri, 09 Mar 2018 11:46:42 -0500
parents beb3a5cdd67d
children 4eb3a598f57c
files Makefile.in src/gtk2.mk src/gtk3.mk src/hunspell.mk src/libvpx.mk src/llvm.mk src/openscenegraph.mk src/pthread-stubs.mk src/qscintilla.mk src/qt5.mk src/qtbase.mk src/renderproto.mk src/s2tc.mk src/sm.mk src/src-msys-libcrypt.mk src/suitesparse.mk src/taglib.mk src/tre.mk src/util-macros.mk src/vala.mk src/vmime.mk src/wget.mk src/wt.mk src/xapian-core.mk
diffstat 24 files changed, 73 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Wed Mar 07 06:44:54 2018 -0500
+++ b/Makefile.in	Fri Mar 09 11:46:42 2018 -0500
@@ -910,7 +910,8 @@
 
 endef
 update:
-	$(foreach PKG,$(PKGS),$(call UPDATE,$(PKG),$(shell $($(PKG)_UPDATE))))
+	$(foreach PKG,$(PKGS),\
+		$(if $($(PKG)_UPDATE),$(call UPDATE,$(PKG),$(shell $($(PKG)_UPDATE))),$(info Warning: No update rule for $(PKG))))
 
 .PHONY: update-octaveforge
 update-octaveforge:
--- a/src/gtk2.mk	Wed Mar 07 06:44:54 2018 -0500
+++ b/src/gtk2.mk	Fri Mar 09 11:46:42 2018 -0500
@@ -11,11 +11,11 @@
 $(PKG)_DEPS     := gettext libpng jpeg tiff jasper glib atk pango cairo gdk-pixbuf
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://git.gnome.org/browse/gtk+/refs/tags' | \
-    grep '<a href=' | \
-    $(SED) -n 's,.*<a[^>]*>\([0-9]*\.[0-9]*[02468]\.[^<]*\)<.*,\1,p' | \
+    $(WGET) -q -O- 'https://github.com/GNOME/gtk/tags' | \
+    $(SED) -n 's|.*releases/tag/\([^"]*\).*|\1|p' | \
     grep -v '^2\.9' | \
     grep '^2\.' | \
+    $(SORT) -Vr | \
     head -1
 endef
 
--- a/src/gtk3.mk	Wed Mar 07 06:44:54 2018 -0500
+++ b/src/gtk3.mk	Fri Mar 09 11:46:42 2018 -0500
@@ -11,11 +11,11 @@
 $(PKG)_DEPS     := gettext libpng jpeg tiff jasper glib atk pango cairo gdk-pixbuf
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://git.gnome.org/browse/gtk+/refs/tags' | \
-    grep '<a href=' | \
-    $(SED) -n 's,.*<a[^>]*>\([0-9]*\.[0-9]*[02468]\.[^<]*\)<.*,\1,p' | \
+    $(WGET) -q -O- 'https://github.com/GNOME/gtk/tags' | \
+    $(SED) -n 's|.*releases/tag/\([^"]*\).*|\1|p' | \
     grep -v '^3\.9' | \
     grep '^3\.' | \
+    $(SORT) -Vr | \
     head -1
 endef
 
--- a/src/hunspell.mk	Wed Mar 07 06:44:54 2018 -0500
+++ b/src/hunspell.mk	Fri Mar 09 11:46:42 2018 -0500
@@ -7,12 +7,13 @@
 $(PKG)_CHECKSUM := 902c76d2b55a22610e2227abc4fd26cbe606a51c
 $(PKG)_SUBDIR   := hunspell-$($(PKG)_VERSION)
 $(PKG)_FILE     := hunspell-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/hunspell/Hunspell/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_URL      := https://github.com/hunspell/hunspell/archive/v$($(PKG)_VERSION).tar.gz
 $(PKG)_DEPS     := libiconv gettext readline pthreads
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://sourceforge.net/projects/hunspell/files/Hunspell/' | \
-    $(SED) -n 's,.*tr title="\([0-9][^"]*\)".*,\1,p' | \
+    $(WGET) -q -O- 'https://github.com/hunspell/hunspell/tags' | \
+    $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | \
+    $(SORT) -Vr | \
     head -1
 endef
 
--- a/src/libvpx.mk	Wed Mar 07 06:44:54 2018 -0500
+++ b/src/libvpx.mk	Fri Mar 09 11:46:42 2018 -0500
@@ -23,8 +23,8 @@
 
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://downloads.webmproject.org/releases/webm/index.html' | \
-    $(SED) -n 's,.*libvpx-\([0-9][^>]*\)\.tar.*,\1,p' | \
+    $(WGET) -q -O- 'https://github.com/webmproject/libvpx/tags' | \
+    $(SED) -n 's|.*releases/tag/\([^"]*\).*|\1|p' | \
     $(SORT) -Vr | \
     head -1
 endef
--- a/src/llvm.mk	Wed Mar 07 06:44:54 2018 -0500
+++ b/src/llvm.mk	Fri Mar 09 11:46:42 2018 -0500
@@ -11,7 +11,7 @@
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
-    wget -q -O- 'http://releases.llvm.org/download.html' | \
+    wget -q -O- 'http://releases.llvm.org/download.html?' | \
     grep 'Download LLVM' | \
     $(SED) -n 's,.*LLVM \([0-9][^<]*\).*,\1,p' | \
     head -1
--- a/src/openscenegraph.mk	Wed Mar 07 06:44:54 2018 -0500
+++ b/src/openscenegraph.mk	Fri Mar 09 11:46:42 2018 -0500
@@ -18,8 +18,7 @@
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://www.openscenegraph.org/index.php/download-section/stable-releases' | \
-    $(SED) -n 's,.*OpenSceneGraph-\([0-9]*\.[0-9]*[02468]\.[^<]*\)\.zip.*,\1,p' | \
-    grep -v rc | \
+    $(SED) -n 's,.*OpenSceneGraph/tree/OpenSceneGraph-\([0-9]*\.[0-9]*[02468]\.[^<]*\)">.*,\1,p' | \
     $(SORT) -V | \
     tail -1
 endef
--- a/src/pthread-stubs.mk	Wed Mar 07 06:44:54 2018 -0500
+++ b/src/pthread-stubs.mk	Fri Mar 09 11:46:42 2018 -0500
@@ -10,6 +10,11 @@
 $(PKG)_URL      := http://xcb.freedesktop.org/dist/$($(PKG)_FILE)
 $(PKG)_DEPS     := 
 
+define $(PKG)_UPDATE
+    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
+    echo $($(PKG)_VERSION)
+endef
+
 ifeq ($(MXE_WINDOWS_BUILD),yes)
   define $(PKG)_BUILD
   endef
--- a/src/qscintilla.mk	Wed Mar 07 06:44:54 2018 -0500
+++ b/src/qscintilla.mk	Fri Mar 09 11:46:42 2018 -0500
@@ -24,9 +24,8 @@
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://www.riverbankcomputing.com/software/qscintilla/download' | \
-        grep QScintilla-gpl | \
-        head -n 1 | \
-        $(SED) -n 's,.*QScintilla-gpl-\([0-9][^>]*\)\.zip.*,\1,p'
+        $(SED) -n 's,.*QScintilla[_-]gpl-\([0-9][^>]*\)\.zip.*,\1,p' | \
+        head -n 1 
 endef
 
 ifneq ($(MXE_NATIVE_BUILD),yes)
--- a/src/qt5.mk	Wed Mar 07 06:44:54 2018 -0500
+++ b/src/qt5.mk	Fri Mar 09 11:46:42 2018 -0500
@@ -10,3 +10,9 @@
 $(PKG)_FILE      = $(subst qtbase,qtimageformats,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtimageformats,$(qtbase_URL))
 $(PKG)_CHECKSUM := #No checksum
+
+define $(PKG)_UPDATE
+    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
+    echo $($(PKG)_VERSION)
+endef
+
--- a/src/qtbase.mk	Wed Mar 07 06:44:54 2018 -0500
+++ b/src/qtbase.mk	Fri Mar 09 11:46:42 2018 -0500
@@ -40,7 +40,7 @@
 endif
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- http://download.qt-project.org/official_releases/qt/5.5/ | \
+    $(WGET) -q -O- http://download.qt-project.org/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/ | \
     $(SED) -n 's,.*href="\(5\.[0-9]\.[^/]*\)/".*,\1,p' | \
     grep -iv -- '-rc' | \
     sort |
--- a/src/renderproto.mk	Wed Mar 07 06:44:54 2018 -0500
+++ b/src/renderproto.mk	Fri Mar 09 11:46:42 2018 -0500
@@ -10,6 +10,11 @@
 $(PKG)_URL      := http://www.x.org/archive/individual/proto/$($(PKG)_FILE)
 $(PKG)_DEPS     := 
 
+define $(PKG)_UPDATE
+    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
+    echo $($(PKG)_VERSION)
+endef
+
 ifeq ($(MXE_WINDOWS_BUILD),yes)
   define $(PKG)_BUILD
   endef
--- a/src/s2tc.mk	Wed Mar 07 06:44:54 2018 -0500
+++ b/src/s2tc.mk	Fri Mar 09 11:46:42 2018 -0500
@@ -10,6 +10,11 @@
 $(PKG)_URL      := https://github.com/divVerent/s2tc/archive/v$($(PKG)_VERSION).zip
 $(PKG)_DEPS     := mesa-proto
 
+define $(PKG)_UPDATE
+    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
+    echo $($(PKG)_VERSION)
+endef
+
 define $(PKG)_BUILD
   cd '$(1)' && ./autogen.sh
   mkdir '$(1)/.build'
--- a/src/sm.mk	Wed Mar 07 06:44:54 2018 -0500
+++ b/src/sm.mk	Fri Mar 09 11:46:42 2018 -0500
@@ -10,6 +10,11 @@
 $(PKG)_URL      := http://www.x.org/archive/individual/lib/$($(PKG)_FILE)
 $(PKG)_DEPS     := ice xproto xtrans
 
+define $(PKG)_UPDATE
+    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
+    echo $($(PKG)_VERSION)
+endef
+
 ifeq ($(MXE_WINDOWS_BUILD),yes)
   define $(PKG)_BUILD
   endef
--- a/src/src-msys-libcrypt.mk	Wed Mar 07 06:44:54 2018 -0500
+++ b/src/src-msys-libcrypt.mk	Fri Mar 09 11:46:42 2018 -0500
@@ -13,7 +13,7 @@
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- '$(MSYS_EXTENSION_URL)/crypt' | \
-    $(SED) -n 's,.*title="libcrypt-\([0-9][^"]*\)".*,\1,p' | \
+    $(SED) -n 's,.*title="crypt-\([0-9][^"]*\)".*,\1,p' | \
     head -1
 endef
 
--- a/src/suitesparse.mk	Wed Mar 07 06:44:54 2018 -0500
+++ b/src/suitesparse.mk	Fri Mar 09 11:46:42 2018 -0500
@@ -6,7 +6,7 @@
 $(PKG)_CHECKSUM := 2fec3bf93314bd14cbb7470c0a2c294988096ed6
 $(PKG)_SUBDIR   := SuiteSparse
 $(PKG)_FILE     := SuiteSparse-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://www.cise.ufl.edu/research/sparse/SuiteSparse/$($(PKG)_FILE)
+$(PKG)_URL      := http://faculty.cse.tamu.edu/davis/SuiteSparse/$($(PKG)_FILE)
 $(PKG)_URL_2    := https://distfiles.macports.org/SuiteSparse/$($(PKG)_FILE)
 $(PKG)_DEPS     := blas lapack
 
@@ -17,7 +17,7 @@
 endif
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://www.cise.ufl.edu/research/sparse/SuiteSparse/' | \
+    $(WGET) -q -O- 'http://faculty.cse.tamu.edu/davis/suitesparse.html' | \
     $(SED) -n 's,.*SuiteSparse-\([0-9][^"]*\)\.tar.*,\1,p' | \
     head -1
 endef
--- a/src/taglib.mk	Wed Mar 07 06:44:54 2018 -0500
+++ b/src/taglib.mk	Fri Mar 09 11:46:42 2018 -0500
@@ -7,12 +7,13 @@
 $(PKG)_CHECKSUM := e657384ccf3284db2daba32dccece74534286012
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://developer.kde.org/~wheeler/files/src/$($(PKG)_FILE)
+$(PKG)_URL      := https://taglib.github.io/releases/$($(PKG)_FILE)
 $(PKG)_DEPS     := zlib
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://developer.kde.org/~wheeler/files/src/?C=M;O=D' | \
-    $(SED) -n 's,.*"taglib-\([0-9][^"]*\)\.tar.*,\1,p' | \
+    $(WGET) -q -O- 'https://github.com/taglib/taglib/tags' | \
+    $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | \
+    $(SORT) -Vr | \
     head -1
 endef
 
--- a/src/tre.mk	Wed Mar 07 06:44:54 2018 -0500
+++ b/src/tre.mk	Fri Mar 09 11:46:42 2018 -0500
@@ -12,7 +12,7 @@
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://laurikari.net/tre/download.html' | \
+    $(WGET) -q -O- 'https://laurikari.net/tre/download/' | \
     $(SED) -n 's,.*tre-\([a-z0-9][^>]*\)\.tar.*,\1,p' | \
     head -1
 endef
--- a/src/util-macros.mk	Wed Mar 07 06:44:54 2018 -0500
+++ b/src/util-macros.mk	Fri Mar 09 11:46:42 2018 -0500
@@ -10,6 +10,11 @@
 $(PKG)_URL      := http://www.x.org/archive/individual/util/$($(PKG)_FILE)
 $(PKG)_DEPS     := 
 
+define $(PKG)_UPDATE
+    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
+    echo $($(PKG)_VERSION)
+endef
+
 ifeq ($(MXE_WINDOWS_BUILD),yes)
   define $(PKG)_BUILD
   endef
--- a/src/vala.mk	Wed Mar 07 06:44:54 2018 -0500
+++ b/src/vala.mk	Fri Mar 09 11:46:42 2018 -0500
@@ -11,8 +11,9 @@
 $(PKG)_DEPS     := glib
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://git.gnome.org/browse/$(PKG)/refs/tags' | \
-    $(SED) -n "s,.*tag/?id=\([0-9]\+\.[0-9]*[02468]\.[^']*\).*,\1,p" | \
+    $(WGET) -q -O- 'https://github.com/GNOME/$(PKG)/tags' | \
+    $(SED) -n 's|.*releases/tag/\([^"]*\).*|\1|p' | \
+    $(SORT) -Vr | \
     head -1
 endef
 
--- a/src/vmime.mk	Wed Mar 07 06:44:54 2018 -0500
+++ b/src/vmime.mk	Fri Mar 09 11:46:42 2018 -0500
@@ -7,12 +7,13 @@
 $(PKG)_CHECKSUM := 670aaecfbab41747e3a8f1d80dd757eb01ac93cb
 $(PKG)_SUBDIR   := kisli-vmime-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := https://github.com/kisli/vmime/tarball/$($(PKG)_VERSION)/$(PKG)_FILE
+$(PKG)_URL      := https://github.com/kisli/vmime/archive/v$($(PKG)_VERSION).tar.gz
 $(PKG)_DEPS     := libiconv gnutls libgsasl pthreads zlib
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/kisli/vmime/commits/master' | \
-    $(SED) -n 's#.*<span class="sha">\([^<]\{7\}\)[^<]\{3\}<.*#\1#p' | \
+    $(WGET) -q -O- 'https://github.com/kisli/vmime/tags' | \
+    $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | \
+    $(SORT) -Vr | \
     head -1
 endef
 
--- a/src/wget.mk	Wed Mar 07 06:44:54 2018 -0500
+++ b/src/wget.mk	Fri Mar 09 11:46:42 2018 -0500
@@ -10,8 +10,8 @@
 $(PKG)_DEPS     := pthreads gnutls libntlm libidn
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://git.savannah.gnu.org/cgit/wget.git/refs/' | \
-    $(SED) -n "s,.*<a href='/cgit/wget.git/tag/?id=v\([0-9.]*\)'>.*,\1,p" | \
+    $(WGET) -q -O- 'https://git.savannah.gnu.org/cgit/wget.git/refs/' | \
+    $(SED) -n "s,.*<a href='/cgit/wget.git/tag/?h=v\([0-9.]*\)'>.*,\1,p" | \
     head -1
 endef
 
--- a/src/wt.mk	Wed Mar 07 06:44:54 2018 -0500
+++ b/src/wt.mk	Fri Mar 09 11:46:42 2018 -0500
@@ -7,12 +7,13 @@
 $(PKG)_CHECKSUM := d3870671a303d64878a1c9fe22765a643e515051
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/witty/$($(PKG)_FILE)
+$(PKG)_URL      := https://github.com/emweb/wt/archive/$($(PKG)_VERSION).tar.gz
 $(PKG)_DEPS     := boost openssl libharu graphicsmagick pango postgresql sqlite
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://sourceforge.net/projects/witty/files/wt/' | \
-    $(SED) -n 's,.*<a href="/projects/witty/files/wt/\([0-9][^>]*\)/.*,\1,p' | \
+    $(WGET) -q -O- 'https://github.com/emweb/wt/tags' | \
+    $(SED) -n 's|.*releases/tag/\([^"]*\).*|\1|p' | \
+    $(SORT) -Vr | \
     head -1
 endef
 
--- a/src/xapian-core.mk	Wed Mar 07 06:44:54 2018 -0500
+++ b/src/xapian-core.mk	Fri Mar 09 11:46:42 2018 -0500
@@ -7,12 +7,12 @@
 $(PKG)_CHECKSUM := 2b96800280fee41eed767289620172f5226c9c4f
 $(PKG)_SUBDIR   := xapian-core-$($(PKG)_VERSION)
 $(PKG)_FILE     := xapian-core-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://oligarchy.co.uk/xapian/$($(PKG)_VERSION)/xapian-core-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://oligarchy.co.uk/xapian/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := zlib
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- http://xapian.org/download | \
-    $(SED) -n 's,.*<a HREF="http://oligarchy.co.uk/xapian/\([^/]*\)/xapian-core[^"]*">.*,\1,p' | \
+    $(SED) -n 's,.*<a HREF="https://oligarchy.co.uk/xapian/\([^/]*\)/xapian-core[^"]*">.*,\1,p' | \
     head -1
 endef