On Sun, Jan 01, 2017 at 07:36:32PM +0100, Landry Breuil wrote:
> On Sun, Jan 01, 2017 at 06:18:15PM +0100, Landry Breuil wrote:
> > On Sat, Dec 31, 2016 at 12:45:52PM +0100, Landry Breuil wrote:
> > > On Sat, Dec 31, 2016 at 04:38:10PM +0500, Alexandr Shadchin wrote:
> > > > On Sat, Dec 31, 2016 at 11:43:00AM +0100, Landry Breuil wrote:
> > > > > On Thu, Dec 29, 2016 at 07:19:38PM +0500, Alexandr Shadchin wrote:
> > > > > > On Thu, Dec 29, 2016 at 03:01:12PM +0100, Landry Breuil wrote:
> > > > > > > On Thu, Dec 29, 2016 at 02:53:04PM +0100, Remi Pointel wrote:
> > > > > > > > On 12/29/16 14:00, Alexandr Shadchin wrote:
> > > > > > > > > On Mon, Dec 26, 2016 at 11:33:43PM +0500, Alexandr Shadchin
> > > > > > > > > wrote:
> > > > > > > > > > On Mon, Dec 26, 2016 at 07:18:54PM +0100, Remi Pointel
> > > > > > > > > > wrote:
> > > > > > > > > > > On 12/26/16 19:12, Alexandr Shadchin wrote:
> > > > > > > > > > > > Hi,
> > > > > > > > > > > >
> > > > > > > > > > > > What is the timeline of flipping py3 flavour
> > > > > > > > > > > > over to python3.5?
> > > > > > > > > > > >
> > > > > > > > > > >
> > > > > > > > > > > Hi,
> > > > > > > > > > >
> > > > > > > > > > > I would like to switch the default python 3 version to
> > > > > > > > > > > 3.6 (I think 3.6 will
> > > > > > > > > > > be imported these days).
> > > > > > > > > > >
> > > > > > > > > > > We should import python 3.6, then run a bulk build and
> > > > > > > > > > > fix the ports don't
> > > > > > > > > > > build. Then we will remove python 3.4 and 3.5 if we can.
> > > > > > > > > > >
> > > > > > > > > > > Remi.
> > > > > > > > > >
> > > > > > > > > > For me, it's even better :-)
> > > > > > > > > >
> > > > > > > > > > I have two weeks free, I can work with fails.
> > > > > > > > > >
> > > > > > > > >
> > > > > > > > > I tried switch on Python 3.6, for me works fine.
> > > > > > > > >
> > > > > > > > > 1. Fix pyo-files (1_fix_pyo.diff)
> > > > > > > > > For more details read PEP 488 [1]
> > > > > > > > > 2. Fix py3-cairo (2_fix_py3-cairo.diff)
> > > > > > > > > 3. Fix py-tornado (3_fix_tornado.diff)
> > > > > > > > > 4. Switch on Python 3.6
> > > > > > > > >
> > > > > > > > > [1] - https://www.python.org/dev/peps/pep-0488/
> > > > > > > > >
> > > > > > > >
> > > > > > > > Sounds good for me, this diff should be tested by landry@ in a
> > > > > > > > bulk.
> > > > > > > >
> > > > > > > > Thank you for your work.
> > > > > > >
> > > > > > > Does this diff has *all* the REVISION bumps needed ?
> > > > > > > I'll put it in the next bulk..
> > > > > > >
> > > > > > > Landry
> > > > > >
> > > > > > Yes, on clean system.
> > > > > >
> > > > > > For my laptop was required bump py-setuptools.
> > > > > > But I'm a noob at this, so it may have missed something :-)
> > > > >
> > > > > So im about to start a bulk with this, but some things that worry me:
> > > > >
> > > > > - you *really* should explain your diffs. the py-tornado looks like
> > > > > magic, why suddenly would the egg-info/requires.txt file be not
> > > > > installed anymore ? wont it affect other ports ?
> > > >
> > > > py-tornado depend:
> > > > py3.4 need py-backport-abc (requires.txt generated)
> > > > py3.6 not need anything (requires.txt not generated)
> > >
> > > ok, thant makes sense :)
> > >
> > > > > - the py3-cairo diff looks like magic. i know waf sucks, but why is
> > > > > this
> > > > > return needed ?
> > > >
> > > > this patch from FreeBSD, that was obtained from Ubuntu repository :)
> > > >
> > > > https://svnweb.freebsd.org/ports/head/graphics/py3-cairo/files/pycairo-1.10.0-waf-py3_5.patch?view=log
> > >
> > > great cargo culting :)
> > >
> > > > > - you didnt bump *any* of the other ports depending on py3, so they
> > > > > will
> > > > > all break because of the plist db. This sucks, because i'll have to
> > > > > do
> > > > > the work (as i explained to remi).
> > > >
> > > > I can make diff for bump all py3 ports.
> > > >
> > > > > - i suppose you didnt build any of the other ports depending on py3
> > > > > besides setuptools ?
> > > >
> > > > I built this py3 ports:
> > > > sqlite3 /usr/local/share/sqlports "select distinct fullpkgpath from
> > > > depends where dependspath like '%python/3.4%'"
> > >
> > > great, but had you built them *before* with py34 so that they were all
> > > registered in your plistdb ? that's the whole point ....
> > >
> > > anyway, starting the bulk with a portstree updated to
> > > https://github.com/openbsd/ports/commit/6864fa0e1c5e96a8095dda077af04c0b30a6ccc2
> > >
> > > with this diff on top:
> > > http://rhaalovely.net/~landry/stuff/py36.fulldiff
> > >
> > > curated list passed to portbump from sqlports, and removed all the
> > > flavors/subpackages.
> >
> > Fwiw, after 25h and 4300 pkgs, the only 'important' fallout is
> > libreoffice, something about pyuno:
> >
> > checking whether /usr/local/bin/python3.6 version is >= 2.6... yes
> > checking for /usr/local/bin/python3.6 version... 3.6
> > checking for /usr/local/bin/python3.6 platform... openbsd6
> > checking for /usr/local/bin/python3.6 script directory...
> > ${prefix}/lib/python3.6/site-packages
> > checking for /usr/local/bin/python3.6 extension module directory...
> > ${exec_prefix}/lib/python3.6/site-packages
> > checking which Python to use for Pyuno... checking for a Python interpreter
> > with version >= 3.3... none
> > internal
> >
> > ...
> > but later on it tries to build a local python 3.5 ?
> > ...
> > mkdir -p
> > /usr/obj/ports/libreoffice-5.2.4.2/libreoffice-5.2.4.2/workdir/ExternalProject/mythes/
> > touch
> > /usr/obj/ports/libreoffice-5.2.4.2/libreoffice-5.2.4.2/workdir/ExternalProject/python3.prepare
> > gmake[1]: *** No rule to make target
> > '/usr/ports/distfiles/libreoffice/Python-3.5.0.tgz', needed by
> > '/usr/obj/ports/libreoffice-5.2.4.2/libreoffice-5.2.4.2/workdir/UnpackedTarget/Python-3.5.0.tgz'.
> > Stop.
>
> So that one is weird, i had a look and Makefile says:
>
> # XXX can't use ${MODPY_DEFAULT_VERSION_3}, it specifically wants 3.3
> # and will try (and fail) to build its own copy if not available.
> MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
>
> but its not commented out ?
>
> patch-configure tries to use/detect python3.4 but hardcodes it, maybe a
> solution would be to add python${MODPY_DEFAULT_VERSION_3} to the patch
> and run SUBST_CMD on configure ? That's what im going to try locally.
> Robert, any idea ?
bulk over, the only fallout is still LO but it should be fine with my
local diff (attached) - im going to give it another go.
Alexandr, i think you should commit your 3 diffs, then we can bump
MODPY_DEFAULT_VERSION_3 in python.port.mk, and i'll commit all the
REVISION bumps. We just need to coordinate to minimize the time between
those commits, i'm available a bit tonight, and offline most of the day
tmrw, so we can also do that tmrw evening.
Unless someone has something to say against switching to 3.6 by default
of course... that still leave pythoners a month to rule out runtime
issues.
Landry
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index e9c6c0b..6162b76 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -19,6 +19,7 @@ PKGNAME-kde= libreoffice-kde-${VERSION}
PKGNAME-java= libreoffice-java-${VERSION}
CATEGORIES= editors productivity
DPB_PROPERTIES= parallel tag:kde4
+REVISION= 0
EPOCH= 0
@@ -364,7 +365,7 @@ OA= x86
OA= x86_64
.endif
-SUBST_VARS+= BV OA
+SUBST_VARS+= BV OA MODPY_DEFAULT_VERSION_3
pre-patch:
@ln -fs /bin/md5 ${WRKDIR}/bin/md5sum
@@ -374,6 +375,9 @@ pre-patch:
@ln -fs /usr/local/bin/gtouch ${WRKDIR}/bin/touch
touch ${WRKSRC}/src.downloaded ${WRKSRC}/autogen.lastrun
+pre-configure:
+ ${SUBST_CMD} ${WRKSRC}/configure
+
post-install:
${INSTALL_SCRIPT} ${FILESDIR}/soffice.sh ${PREFIX}/bin/soffice
${SUBST_CMD} ${PREFIX}/bin/soffice
diff --git a/editors/libreoffice/patches/patch-configure
b/editors/libreoffice/patches/patch-configure
index 0f0dff7..9194b4c 100644
--- a/editors/libreoffice/patches/patch-configure
+++ b/editors/libreoffice/patches/patch-configure
@@ -38,7 +38,7 @@ $OpenBSD: patch-configure,v 1.16 2016/11/02 14:33:47 robert
Exp $
else
- for am_cv_pathless_PYTHON in python python2 python3 python3.3 python3.2
python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3
python2.2 python2.1 python2.0 none; do
-+ for am_cv_pathless_PYTHON in python3.4 python python2 python3 python3.3
python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4
python2.3 python2.2 python2.1 python2.0 none; do
++ for am_cv_pathless_PYTHON in python${MODPY_DEFAULT_VERSION_3} python
python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6
python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
test "$am_cv_pathless_PYTHON" = none && break
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
@@ -47,7 +47,7 @@ $OpenBSD: patch-configure,v 1.16 2016/11/02 14:33:47 robert
Exp $
else
- for am_cv_pathless_PYTHON in python python2 python3 python3.3 python3.2
python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3
python2.2 python2.1 python2.0 none; do
-+ for am_cv_pathless_PYTHON in python3.4 python python2 python3 python3.3
python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4
python2.3 python2.2 python2.1 python2.0 none; do
++ for am_cv_pathless_PYTHON in python${MODPY_DEFAULT_VERSION_3} python
python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6
python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
test "$am_cv_pathless_PYTHON" = none && break
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
@@ -56,7 +56,7 @@ $OpenBSD: patch-configure,v 1.16 2016/11/02 14:33:47 robert
Exp $
else
- for am_cv_pathless_PYTHON in python python2 python3 python3.3 python3.2
python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3
python2.2 python2.1 python2.0 none; do
-+ for am_cv_pathless_PYTHON in python3.4 python python2 python3 python3.3
python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4
python2.3 python2.2 python2.1 python2.0 none; do
++ for am_cv_pathless_PYTHON in python${MODPY_DEFAULT_VERSION_3} python
python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6
python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
test "$am_cv_pathless_PYTHON" = none && break
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
