pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Many packages: Fix breakage when python defaults to 3.5.
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Sun May 1 11:21:00 2016 +0200
Changeset: d1a88584a8767e93740ff93f4cd3e2d612458125
Modified Files:
bleachbit/Makefile
caja-dropbox/Makefile
eom/options.mk
gnome/Makefile
gnuradio-companion/Makefile
gnuradio-default/Makefile
libappindicator/Makefile
libappindicator3/Makefile
libinstpatch/buildlink3.mk
mozo/Makefile
pluma/options.mk
py-dreampie/Makefile
py-notify-dev/buildlink3.mk
py-othman/Makefile
py-webkit/buildlink3.mk
thawab/Makefile
Log Message:
Many packages: Fix breakage when python defaults to 3.5.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d1a88584a8767e93740ff93f4cd3e2d612458125
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
bleachbit/Makefile | 2 +-
caja-dropbox/Makefile | 2 ++
eom/options.mk | 1 +
gnome/Makefile | 2 +-
gnuradio-companion/Makefile | 1 +
gnuradio-default/Makefile | 1 +
libappindicator/Makefile | 1 +
libappindicator3/Makefile | 1 +
libinstpatch/buildlink3.mk | 1 +
mozo/Makefile | 1 +
pluma/options.mk | 1 +
py-dreampie/Makefile | 2 +-
py-notify-dev/buildlink3.mk | 1 +
py-othman/Makefile | 1 +
py-webkit/buildlink3.mk | 2 +-
thawab/Makefile | 1 +
16 files changed, 17 insertions(+), 4 deletions(-)
diffs:
diff --git a/bleachbit/Makefile b/bleachbit/Makefile
index eeb5ed3..5504c28 100644
--- a/bleachbit/Makefile
+++ b/bleachbit/Makefile
@@ -16,7 +16,7 @@ DEPENDS+= ${PYPKGPREFIX}-notify>=0.2.1:../../sysutils/py-notify
USE_LANGUAGES= # none
-
+PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-gtk2
PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
REPLACE_PYTHON+= bleachbit.py
diff --git a/caja-dropbox/Makefile b/caja-dropbox/Makefile
index 6508d6d..1913d06 100644
--- a/caja-dropbox/Makefile
+++ b/caja-dropbox/Makefile
@@ -11,6 +11,8 @@ DEPENDS+= ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
DEPENDS+= ${PYPKGPREFIX}-gobject-[0-9]*:../../devel/py-gobject
DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
+PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-gtk2, py-gobject
+
REPLACE_PYTHON= caja-dropbox.in
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/eom/options.mk b/eom/options.mk
index af36e50..19270d0 100644
--- a/eom/options.mk
+++ b/eom/options.mk
@@ -36,6 +36,7 @@ CONFIGURE_ARGS+= --without-cms
.endif
.if !empty(PKG_OPTIONS:Mpython)
+PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-gtk2
.include "../../lang/python/extension.mk"
.include "../../x11/py-gtk2/buildlink3.mk"
.include "../../devel/py-gobject/buildlink3.mk"
diff --git a/gnome/Makefile b/gnome/Makefile
index 2524b5d..18b9941 100644
--- a/gnome/Makefile
+++ b/gnome/Makefile
@@ -10,7 +10,7 @@ COMMENT= Meta-package for the GNOME desktop
META_PACKAGE= yes
-PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-ORBit via py-gnome2
+PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-ORBit via py-gnome2, py-gtk2 via py-gtksourceview
.include "../../lang/python/pyversion.mk"
diff --git a/gnuradio-companion/Makefile b/gnuradio-companion/Makefile
index 34ccb32..89968bc 100644
--- a/gnuradio-companion/Makefile
+++ b/gnuradio-companion/Makefile
@@ -16,6 +16,7 @@ REPLACE_BASH= grc/freedesktop/grc_setup_freedesktop.in
CMAKE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_ARGS+= -DENABLE_GRC=ON
+PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-gtk2
.include "../../x11/py-gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/gnuradio-default/Makefile b/gnuradio-default/Makefile
index 4aab2be..8dee4da 100644
--- a/gnuradio-default/Makefile
+++ b/gnuradio-default/Makefile
@@ -65,6 +65,7 @@ post-patch:
# gr-zeromq/lib/pub_sink_impl.h:27:19: fatal error: zmq.hpp: No such file..
.include "../../net/zeromq/buildlink3.mk"
+PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-gtk2
.include "../../x11/py-gtk2/buildlink3.mk"
.include "../../x11/py-qt4/buildlink3.mk"
.include "../../x11/py-wxWidgets/buildlink3.mk"
diff --git a/libappindicator/Makefile b/libappindicator/Makefile
index ac9aff0..a8e3039 100644
--- a/libappindicator/Makefile
+++ b/libappindicator/Makefile
@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.6 2015/04/10 19:06:32 krytarowski Exp $
USE_GTK_VERSION=2
+PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-gtk2
.include "Makefile.common"
diff --git a/libappindicator3/Makefile b/libappindicator3/Makefile
index 8631af2..cdfffeb 100644
--- a/libappindicator3/Makefile
+++ b/libappindicator3/Makefile
@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.2 2015/04/10 19:06:32 krytarowski Exp $
USE_GTK_VERSION=3
+PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-gtk2
.include "../../wip/libappindicator/Makefile.common"
diff --git a/libinstpatch/buildlink3.mk b/libinstpatch/buildlink3.mk
index d03b59f..13f173c 100644
--- a/libinstpatch/buildlink3.mk
+++ b/libinstpatch/buildlink3.mk
@@ -20,6 +20,7 @@ pkgbase := libinstpatch
.endif
.include "../../devel/py-gobject/buildlink3.mk"
+PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-gtk2
.include "../../x11/py-gtk2/buildlink3.mk"
.include "../../audio/libsndfile/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
diff --git a/mozo/Makefile b/mozo/Makefile
index 361f4f8..102b9df 100644
--- a/mozo/Makefile
+++ b/mozo/Makefile
@@ -8,6 +8,7 @@ CATEGORIES= x11
COMMENT= Menu editor for MATE
DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.13.0:../../x11/py-gtk2
+PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-gtk2
PY_PATCHPLIST= yes
diff --git a/pluma/options.mk b/pluma/options.mk
index 3d48216..04c7cdf 100644
--- a/pluma/options.mk
+++ b/pluma/options.mk
@@ -23,6 +23,7 @@ USE_TOOLS+= bash:run
REPLACE_PYTHON+= plugins/externaltools/data/switch-c.tool.in
REPLACE_BASH+= plugins/externaltools/data/search-recursive.tool.in
PLIST.python= yes
+PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-gtk2, also via py-gtksourceview
.include "../../lang/python/application.mk"
.include "../../devel/py-gobject/buildlink3.mk"
.include "../../x11/py-gtk2/buildlink3.mk"
diff --git a/py-dreampie/Makefile b/py-dreampie/Makefile
index 1607bb1..e653dea 100644
--- a/py-dreampie/Makefile
+++ b/py-dreampie/Makefile
@@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v3
USE_LANGUAGES= # none
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-gtk2, py-gobject
+PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-gtk2, py-gobject, py-gtksourceview
.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
diff --git a/py-notify-dev/buildlink3.mk b/py-notify-dev/buildlink3.mk
index 4691be9..7c46729 100644
--- a/py-notify-dev/buildlink3.mk
+++ b/py-notify-dev/buildlink3.mk
@@ -11,6 +11,7 @@ BUILDLINK_API_DEPENDS.py-notify+= ${PYPKGPREFIX}-notify>=0.2.0
BUILDLINK_ABI_DEPENDS.py-notify+= ${PYPKGPREFIX}-notify>=0.2.0
BUILDLINK_PKGSRCDIR.py-notify?= ../../sysutils/py-notify
+PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-gtk2
.include "../../x11/py-gtk2/buildlink3.mk"
.endif # PY_NOTIFY_BUILDLINK3_MK
diff --git a/py-othman/Makefile b/py-othman/Makefile
index d0cd6a1..9bd2095 100644
--- a/py-othman/Makefile
+++ b/py-othman/Makefile
@@ -19,6 +19,7 @@ USE_TOOLS+= intltool msgfmt
USE_LANGUAGES= # none
PYDISTUTILSPKG= yes
+PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-gtk2
.include "../../devel/pango/buildlink3.mk"
.include "../../lang/python/extension.mk"
diff --git a/py-webkit/buildlink3.mk b/py-webkit/buildlink3.mk
index 903c68f..7a5b3f9 100644
--- a/py-webkit/buildlink3.mk
+++ b/py-webkit/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.py-webkitgtk+= ${PYPKGPREFIX}-webkitgtk>=1.1.6
BUILDLINK_ABI_DEPENDS.py-webkitgtk?= ${PYPKGPREFIX}-webkitgtk>=1.1.7nb1
BUILDLINK_PKGSRCDIR.py-webkitgtk?= ../../wip/py-webkit
-
+PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-gtk2
.include "../../x11/py-gtk2/buildlink3.mk"
.include "../../www/webkit24-gtk/buildlink3.mk"
.endif # PY_WEBKITGTK_BUILDLINK3_MK
diff --git a/thawab/Makefile b/thawab/Makefile
index 3712fd0..9370e64 100644
--- a/thawab/Makefile
+++ b/thawab/Makefile
@@ -23,6 +23,7 @@ USE_TOOLS+= intltool msgfmt
USE_LANGUAGES= # none
PYDISTUTILSPKG= yes
+PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-gtk2
.include "../../devel/pango/buildlink3.mk"
.include "../../lang/python/extension.mk"
Home |
Main Index |
Thread Index |
Old Index