pkgsrc-WIP-changes archive

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

uzbl-git: Drop both patches merged upstream.



Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Sat Jan 30 17:56:43 2016 +0100
Changeset:	6962bc26b2c6cca4cc7f04ceb64fc8fae0458c59

Modified Files:
	uzbl-git/distinfo
Removed Files:
	uzbl-git/patches/patch-Makefile
	uzbl-git/patches/patch-misc_hash.sh

Log Message:
uzbl-git: Drop both patches merged upstream.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6962bc26b2c6cca4cc7f04ceb64fc8fae0458c59

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 uzbl-git/distinfo                   |  2 --
 uzbl-git/patches/patch-Makefile     | 15 ---------------
 uzbl-git/patches/patch-misc_hash.sh | 15 ---------------
 3 files changed, 32 deletions(-)

diffs:
diff --git a/uzbl-git/distinfo b/uzbl-git/distinfo
index 84b4058..afc7651 100644
--- a/uzbl-git/distinfo
+++ b/uzbl-git/distinfo
@@ -1,4 +1,2 @@
 $NetBSD$
 
-SHA1 (patch-Makefile) = a1a64676b4ebe7e7c7d9a0acb5040b133b3d5884
-SHA1 (patch-misc_hash.sh) = 57578aed83b9c2381d4bc18cb4974861196a1cab
diff --git a/uzbl-git/patches/patch-Makefile b/uzbl-git/patches/patch-Makefile
deleted file mode 100644
index b2f6e96..0000000
--- a/uzbl-git/patches/patch-Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Allow overriding the name of Python 3 interpreter.
-
---- Makefile.orig	2015-12-29 21:19:52.000000000 +0000
-+++ Makefile
-@@ -17,7 +17,7 @@ INSTALL    ?= install -p
- ENABLE_WEBKIT2 ?= no
- ENABLE_GTK3    ?= auto
- 
--PYTHON   = python3
-+PYTHON  ?= python3
- 
- # --- configuration ends here ---
- 
diff --git a/uzbl-git/patches/patch-misc_hash.sh b/uzbl-git/patches/patch-misc_hash.sh
deleted file mode 100644
index f0b34ee..0000000
--- a/uzbl-git/patches/patch-misc_hash.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Try to use a commit ID if there are no tags available.
-
---- misc/hash.sh.orig	2015-12-29 21:19:52.000000000 +0000
-+++ misc/hash.sh
-@@ -9,7 +9,7 @@ tarball_check='$Format:$'
- 
- # ... but try to use whatever git tells us if there is a .git folder
- if [ -d .git ] && [ -r .git ]; then
--    hash=$( git describe --tags )
-+    hash=$( git describe --tags --always )
-     echo $hash
- elif [ -n "$tarball_check" ]; then
-     echo '$Format:%h$'


Home | Main Index | Thread Index | Old Index