UPDATE: x11/qt5/qtwebkit
Here is a huge diff to update QtWebKit from 5.9.0 to 5.212.0. 5.212.0
comes from a independent project: https://github.com/qtwebkit/qtwebkit
It's a QtWebKit with a more modern WebKit code base which fix a lot of
bugs and security holes.
I have already made a comparable update [1]. This one was much more
difficult but all consumers looks fine. Tested with qgis, digikam and
upcoming otter-browser browser. I just built and port-lib-depends-check
test the others:
graphics/digikam
databases/kexi
devel/kdevelop
devel/qt-creator
devel/kf5/kdesignerplugin
devel/kf5/kdewebkit
devel/kreport
editors/calligra
editors/ghostwriter
devel/zeal
geo/gpsbabel
geo/merkaartor
geo/qgis
net/ktorrent
editors/sigil
misc/subsurface
multimedia/upplay
www/ruby-capybara-webkit
net/qsyncthingtray
net/qsyncthingtray
mail/trojita
net/owncloudclient
x11/kde-applications/kdenlive
x11/kde-applications/rocs
x11/kde-applications/umbrello
x11/py-qt5
x11/smtube
x11/qt5/qttools
Let's take a look at the port changes:
- Remove qtwebkit-examples, this can go away
- Yes meta/qt5 needs a tweak and bump.
- Build the old qtwebkit docs, there is no new one.
- Almost all patches can be removed. New patches come from NetBSD.
- icu>=61.1 patches deleted.
Test note:
If you are not using dpd(1), you have to deinstall qt5base first otherwise
you'll run into the following issue:
===> Installing qtwebkit-5.212.0 from /usr/ports/packages/amd64/all/
qtwebkit-5.9.0p11->5.212.0 forward dependencies:
| Dependencies of qt5-5.9.8p0 on qtwebkit-=5.9.0 don't match
NOT MERGING: can't find update for qt5-5.9.8p0-> (ok)
Couldn't find updates for qt5-5.9.8p0 qtwebkit-5.9.0p11
Couldn't install qtwebkit-5.212.0
Should we maybe bump all x11/qt5/qt* ports?
This is a big jump to a Qt update because 5.212.0 works fine with
my upcoming Qt update.
Feedback, OK? (I don't think anyone wants to take responsibility for
this. -- other comments also fine) Tests really welcome!
In retrospect a simple update diff.
RS
[1]: https://marc.info/?l=openbsd-ports&m=153529445721820&w=2
Index: Makefile
===
RCS file: /cvs/ports/x11/qt5/Makefile,v
retrieving revision 1.60
diff -u -p -r1.60 Makefile
--- Makefile25 Jan 2018 15:02:25 - 1.60
+++ Makefile11 Feb 2020 21:29:04 -
@@ -31,7 +31,6 @@
SUBDIR += qtvirtualkeyboard
SUBDIR += qtwebchannel
SUBDIR += qtwebkit
- SUBDIR += qtwebkit-examples
SUBDIR += qtwebsockets
SUBDIR += qtx11extras
SUBDIR += qtxmlpatterns
Index: Makefile.version
===
RCS file: /cvs/ports/x11/qt5/Makefile.version,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.version
--- Makefile.version5 Nov 2019 10:18:53 - 1.8
+++ Makefile.version11 Feb 2020 21:29:04 -
@@ -3,7 +3,7 @@
QT5_VERSION = 5.9.8
QT5_DIST_VERSION = 5.9.8
-QT5_WEBKIT_VERSION = 5.9.0
+QT5_WEBKIT_VERSION = 5.212.0
# This one is used for building dependencies for examples and documentation,
# which obviously should be in sync with core packages.
Index: docs/Makefile
===
RCS file: /cvs/ports/x11/qt5/docs/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- docs/Makefile 6 Nov 2019 17:12:15 - 1.9
+++ docs/Makefile 11 Feb 2020 21:29:04 -
@@ -6,6 +6,7 @@ COMMENT-qch = qdoc-compiled documentati
PKGNAME = qt5-docs-${QT5_VERSION}
PKGNAME-html = qt5-html-${QT5_VERSION}
PKGNAME-qch = qt5-qch-${QT5_VERSION}
+WEBKIT_DOCS_VERSION = 5.9.0
MULTI_PACKAGES = -html -qch
SUBPACKAGE ?= -html
@@ -48,10 +49,10 @@ DOC_COMPONENTS = \
qtx11extras \
qtxmlpatterns
-MASTER_SITES0 =
https://download.qt.io/community_releases/${DIST_VERSION:R}/${QT5_WEBKIT_VERSION}-final/
-MASTER_SITES1 =
https://ftp1.nluug.nl/languages/qt/community_releases/${DIST_VERSION:R}/${QT5_WEBKIT_VERSION}-final/
+MASTER_SITES0 =
https://download.qt.io/community_releases/${DIST_VERSION:R}/${WEBKIT_DOCS_VERSION}-final/
+MASTER_SITES1 =
https://ftp1.nluug.nl/languages/qt/community_releases/${DIST_VERSION:R}/${WEBKIT_DOCS_VERSION}-final/
DISTFILES =
${DOC_COMPONENTS:Nqtwebkit:C/$/-opensource-src-${QT5_DIST_VERSION}${EXTRACT_SUFX}/}:0
-DISTFILES += qtwebkit-opensource-src-${QT5_WEBKIT_VERSION}${EXTRACT_SUFX}:1
+DISTFILES += qtwebkit-opensource-src-${WEBKIT_DOCS_VERSION}${EXTRACT_SUFX}:1
MODQT5_USE_CXX11 = No
CONFIGURE_STYLE = none
Index: qtwebkit/Makefile
===
RCS file: /cvs/ports/x11/qt5/qtwebkit/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- qtwebkit/Makefile 7 Jan 2020 20:22:08 - 1.17
+++ qtwebkit/Makefile 11 Feb 2020 21:29:04 -
@@ -1,29 +1,50 @@
# $OpenBSD: Makefile,v 1.17 2020/01/07
UPDATE: www/otter-browser
Update otter-browser to the latest stable version which supports qtwebkit from https://github.com/qtwebkit/qtwebkit or qtwebengin (Which is not ported) but no more qtwebkit 5.9.0. Tested with upcoming x11/qt5/qtwebkit update. OK? Index: Makefile === RCS file: /cvs/ports/www/otter-browser/Makefile,v retrieving revision 1.30 diff -u -p -u -p -r1.30 Makefile --- Makefile12 Jul 2019 20:50:49 - 1.30 +++ Makefile12 Feb 2020 05:19:00 - @@ -2,8 +2,7 @@ COMMENT = browser aiming to recreate classic Opera (12.x) UI using Qt5 -DISTNAME = otter-browser-0.9.94 -REVISION = 2 +DISTNAME = otter-browser-1.0.01 CATEGORIES = www @@ -30,7 +29,7 @@ LIB_DEPENDS = textproc/hunspell \ x11/qt5/qtdeclarative \ x11/qt5/qtmultimedia \ x11/qt5/qtsvg \ - x11/qt5/qtwebkit \ + x11/qt5/qtwebkit>=5.212.0 \ x11/qt5/qtxmlpatterns NO_TEST = Yes Index: distinfo === RCS file: /cvs/ports/www/otter-browser/distinfo,v retrieving revision 1.17 diff -u -p -u -p -r1.17 distinfo --- distinfo4 Jan 2018 18:55:16 - 1.17 +++ distinfo12 Feb 2020 05:19:00 - @@ -1,2 +1,2 @@ -SHA256 (otter-browser-0.9.94.tar.bz2) = 9ylzbT4pzVwPOfLqqjdUpjK+6XJF5i7KbsdaHMa2jeM= -SIZE (otter-browser-0.9.94.tar.bz2) = 3029327 +SHA256 (otter-browser-1.0.01.tar.bz2) = CG15d7yoIcpiSmywSaSldtuFfOhV+oujWlccoevzxrA= +SIZE (otter-browser-1.0.01.tar.bz2) = 3189343 Index: pkg/PLIST === RCS file: /cvs/ports/www/otter-browser/pkg/PLIST,v retrieving revision 1.10 diff -u -p -u -p -r1.10 PLIST --- pkg/PLIST 29 Jun 2018 22:16:22 - 1.10 +++ pkg/PLIST 12 Feb 2020 05:19:00 - @@ -24,6 +24,7 @@ share/otter-browser/locale/otter-browser share/otter-browser/locale/otter-browser_et.qm share/otter-browser/locale/otter-browser_fi.qm share/otter-browser/locale/otter-browser_fr.qm +share/otter-browser/locale/otter-browser_gl.qm share/otter-browser/locale/otter-browser_he.qm share/otter-browser/locale/otter-browser_hr.qm share/otter-browser/locale/otter-browser_hu.qm @@ -47,6 +48,7 @@ share/otter-browser/locale/otter-browser share/otter-browser/locale/otter-browser...@ijekavianlatin.qm share/otter-browser/locale/otter-browser...@latin.qm share/otter-browser/locale/otter-browser_sv.qm +share/otter-browser/locale/otter-browser_th.qm share/otter-browser/locale/otter-browser_tr.qm share/otter-browser/locale/otter-browser_uk.qm share/otter-browser/locale/otter-browser_yue.qm
[update patch] nnn 2.9 -> 3.0
This patch updates nnn from 2.9 to 3.0.
With the new version we dont need our patch for sizes any more.
Tested so far on two amd64 systems.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/nnn/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile24 Jan 2020 15:32:23 - 1.5
+++ Makefile12 Feb 2020 08:12:53 -
@@ -2,7 +2,7 @@
COMMENT = the missing terminal file browser for X
-V =2.9
+V =3.0
DISTNAME = nnn-v${V}
PKGNAME = nnn-${V}
@@ -26,7 +26,7 @@ FAKE_FLAGS = MANPREFIX="$(PREFIX)/man"
USE_GMAKE =Yes
NO_TEST = Yes
-WRKDIST = ${WRKDIR}/nnn
+WRKDIST = ${WRKDIR}/nnn-${V}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/bash-completion/completions/
Index: distinfo
===
RCS file: /cvs/ports/sysutils/nnn/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo24 Jan 2020 15:32:23 - 1.3
+++ distinfo12 Feb 2020 08:12:53 -
@@ -1,2 +1,2 @@
-SHA256 (nnn-v2.9.tar.gz) = ugsHsNh7ptZEIlnal22OM+1pjeQygjr7b8b2gBy92fY=
-SIZE (nnn-v2.9.tar.gz) = 99324
+SHA256 (nnn-v3.0.tar.gz) = BNttZxDOEjLHeb9wE3qGVX5IZhTiAydxcSK7Y/NjSPc=
+SIZE (nnn-v3.0.tar.gz) = 102636
Index: patches/patch-src_nnn_c
===
RCS file: patches/patch-src_nnn_c
diff -N patches/patch-src_nnn_c
--- patches/patch-src_nnn_c 24 Jan 2020 15:32:23 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_nnn_c,v 1.1 2020/01/24 15:32:23 bket Exp $
-
-Fix displaying wrong capacity. Taken from https://github.com/jarun/nnn/pull/441
-
-Index: src/nnn.c
src/nnn.c.orig
-+++ src/nnn.c
-@@ -3285,7 +3285,7 @@ static size_t get_fs_info(const char *path, bool type)
- return 0;
-
- if (type == CAPACITY)
-- return svb.f_blocks << ffs((int)(svb.f_bsize >> 1));
-+ return svb.f_blocks << ffs((int)(svb.f_frsize >> 1));
-
- return svb.f_bavail << ffs((int)(svb.f_frsize >> 1));
- }
Re: enhance README for games/gemrb
On Wed, February 12, 2020 01:10, Solene Rapenne wrote: > Hi, honestly I never remember how to use gemrb and I never have any > internet connection when I want to play with it... > > I propose to explain how to start a game with it, but I'm not sure my > wording is really good. > Hi! Not sure it is really necessary but it's cheap to make such a tweak. See comments below. > Index: Makefile > === > RCS file: /data/cvs/ports/games/gemrb/Makefile,v > retrieving revision 1.15 > diff -u -p -r1.15 Makefile > --- Makefile 13 Dec 2019 08:24:26 - 1.15 > +++ Makefile 11 Feb 2020 22:09:07 - > @@ -5,6 +5,7 @@ SHARED_LIBS +=gemrb_core 0.0 > COMMENT =open-source implementation of Bioware's Infinity Engine > > DISTNAME = gemrb-0.8.6 > +REVISION = 0 > > CATEGORIES = games emulators x11 > > Index: pkg/README > === > RCS file: /data/cvs/ports/games/gemrb/pkg/README,v > retrieving revision 1.1 > diff -u -p -r1.1 README > --- pkg/README31 Jul 2019 07:55:32 - 1.1 > +++ pkg/README11 Feb 2020 22:08:47 - > @@ -16,3 +16,14 @@ Extracting > innoextract from packages can be used to extract the GOG.com version. > > $ innoextract -g -m setup_baldurs_gate_2.0.0.20.exe > + > +Configuration > += > + > +1. Copy the file GemRB.cfg.sample from this package and name it > + like bg2.cfg under a repertory of your choice One have GemRB.cfg already in /etc/gemrb. Should be sufficient for single-user desktop. For multi-user systems instructions for copying config to ~/.gemrb/ have more value IMO. > + > +2. Modify bg2.cfg to change the paths to the folder having the file > + CHITIN.KEY in the variables: GamePath, CD1, CD2, CD3, CD4 and CD5 > + GemRB.cfg is containing comments on all its flags bu we can mention some of them which are needed for a quick start. > +3. Start with gemrb -c bg2.cfg > Using default paths (i.e. /etc/gemrb/GemRB.cfg) won't require pointing to config file. But this would be worth to describe for running multiple games in gemrb.
Re: WIP: Tor Browser 9.0.4
On Wed, Feb 12, 2020 at 07:30:22AM +0100, clematis wrote:
> On Tue, Feb 11, 2020 at 10:12:20PM +0100, Caspar Schutijser wrote:
> > On Tue, Feb 11, 2020 at 03:23:03PM +0100, Landry Breuil wrote:
> > > On Sat, Jan 11, 2020 at 03:43:06PM +0100, Caspar Schutijser wrote:
> > > > On Fri, Jan 10, 2020 at 10:31:15AM +, Stuart Henderson wrote:
> > > > > On 2019/12/28 09:07, Caspar Schutijser wrote:
> > >
> > > That seems built on top of a release candidate tarball
> > > (src-firefox-tor-browser-68.4.1esr-9.0-1-build1) is it expected ?
> >
> > To the best of my knowledge, it is not a release candidate tarball.
> > It is the only file in that directory of their mirror
> > (https://dist.torproject.org/torbrowser/9.0.4/) which contains source
> > code for the Tor Browser, I think. But I may be wrong. What makes you
> > think the tarball contains a release candidate? The structure of the
> > name of the distfile is definitely a little unusual.
>
> That's a good question, I will try to ask upstream see how to identify
> release candidate, but as per the release note, Tb-browser 9.0.4 was to
> update Firefox to 68.4.1esr.
ok good, it's just that in mozilla land, build1 is "first release
candidate", that's all - cf
https://ftp.mozilla.org/pub/firefox/candidates/73.0-candidates/build1/source/
&
https://ftp.mozilla.org/pub/firefox/candidates/73.0-candidates/build2/source/
&
https://ftp.mozilla.org/pub/firefox/candidates/73.0-candidates/build3/source/
of course TB-browser might not use the same convention :)
> > I can probably do this during the weekend but if someone beats me to it
> > that's fine of course.
>
> gdb-7.12.1p9
> rust-1.41.0
> tb-browser-9.0.4
> tb-noscript-11.0.11
> tb-https-everywhere-2019.11.7
>
> build/package/install OK on amd64 with rust-1.41.0
> Just ran it a bit this morning and it's working as expected.
Great, thanks !
> Well, seems like 9.0.5 is in the pipe [1]
>
> Tor Browser 9.0.5 -- February 11 2020
> * All Platforms
>* Update Firefox to 68.5.0esr
>* Bump NoScript to 11.0.13
>* Bug 32053: Fix LLVM reproducibility issues
>* Bug 32255: Missing ORIGIN header breaks CORS
>* Bug 32891: Add new default bridges
We'll see what ${MAINTAINER} thinks about it, but at some point an
update (9.0.4 or 9.0.5) might get commited with a MAINTAINER timeout..
Landry
update: sysutils/py-prometheus_client
Hi ports@,
Here's an update of this port from 0.6.0 to 0.7.1
According to changelog:
[ENHANCEMENT] Multiprocess exposition speed boost (#421)
[ENHANCEMENT] optimize openmetrics text parsing (~4x perf) (#402)
[ENHANCEMENT] Add python3.7 support (#418)
[ENHANCEMENT] Change exemplar length limit to be only for label names+values
(#397)
[BUGFIX] Disable gcCollector for pypy (#380)
[BUGFIX] multiprocess: don't crash on missing gauge_live/sum files (#424)
[BUGFIX] correctly bind method on Python 2.x (#403)
The pypi package does not include the tests folder, so I left the
NO_TEST as it is.
The only consumer for this port is www/jupyter-notebook
All tests pass for it, although I only tested py3.
Cheers,
Paco.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/py-prometheus_client/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile12 Jul 2019 20:49:49 - 1.2
+++ Makefile12 Feb 2020 09:46:28 -
@@ -2,7 +2,7 @@
COMMENT = python client for the prometheus monitoring system
-MODPY_EGG_VERSION =0.6.0
+MODPY_EGG_VERSION =0.7.1
DISTNAME = prometheus_client-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
Index: distinfo
===
RCS file: /cvs/ports/sysutils/py-prometheus_client/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo29 Apr 2019 13:05:01 - 1.1.1.1
+++ distinfo12 Feb 2020 09:46:28 -
@@ -1,2 +1,2 @@
-SHA256 (prometheus_client-0.6.0.tar.gz) =
Gzi5WHUPZvIIvNmrkqYzwMmU2IWcgx96vB9Gck/O5JA=
-SIZE (prometheus_client-0.6.0.tar.gz) = 36583
+SHA256 (prometheus_client-0.7.1.tar.gz) =
cc0korPrM1y4AMcVn0I98b1NzVFxsjS+FePzHsn2Ito=
+SIZE (prometheus_client-0.7.1.tar.gz) = 38440
--
Paco Esteban.
5818130B8A6DBC03
Re: UPDATE: x11/qt5/qtwebkit
On Wed, Feb 12, 2020 at 09:36:59AM +0100, Rafael Sadowski wrote: > Here is a huge diff to update QtWebKit from 5.9.0 to 5.212.0. 5.212.0 > comes from a independent project: https://github.com/qtwebkit/qtwebkit > It's a QtWebKit with a more modern WebKit code base which fix a lot of > bugs and security holes. > > I have already made a comparable update [1]. This one was much more > difficult but all consumers looks fine. Tested with qgis, digikam and > upcoming otter-browser browser. I just built and port-lib-depends-check > test the others: > > graphics/digikam > databases/kexi > devel/kdevelop > devel/qt-creator > devel/kf5/kdesignerplugin > devel/kf5/kdewebkit > devel/kreport > editors/calligra > editors/ghostwriter > devel/zeal > geo/gpsbabel > geo/merkaartor > geo/qgis > net/ktorrent > editors/sigil > misc/subsurface > multimedia/upplay > www/ruby-capybara-webkit > net/qsyncthingtray > net/qsyncthingtray > mail/trojita > net/owncloudclient > x11/kde-applications/kdenlive > x11/kde-applications/rocs > x11/kde-applications/umbrello > x11/py-qt5 > x11/smtube > x11/qt5/qttools > > Let's take a look at the port changes: > > - Remove qtwebkit-examples, this can go away > - Yes meta/qt5 needs a tweak and bump. > - Build the old qtwebkit docs, there is no new one. > - Almost all patches can be removed. New patches come from NetBSD. > - icu>=61.1 patches deleted. > > Test note: > > If you are not using dpd(1), you have to deinstall qt5base first otherwise > you'll run into the following issue: > > ===> Installing qtwebkit-5.212.0 from /usr/ports/packages/amd64/all/ > qtwebkit-5.9.0p11->5.212.0 forward dependencies: > | Dependencies of qt5-5.9.8p0 on qtwebkit-=5.9.0 don't match > NOT MERGING: can't find update for qt5-5.9.8p0-> (ok) > Couldn't find updates for qt5-5.9.8p0 qtwebkit-5.9.0p11 > Couldn't install qtwebkit-5.212.0 > > Should we maybe bump all x11/qt5/qt* ports? > > This is a big jump to a Qt update because 5.212.0 works fine with > my upcoming Qt update. > > Feedback, OK? (I don't think anyone wants to take responsibility for > this. -- other comments also fine) Tests really welcome! I definitely support this move forward :) Ppl using apps in the list should definitely runtime test their favorite app.. and i think now is a good time in the release cycle for such an update, and that would unblock your QT5 work. One think we should make sure to check is arch coverage, ie check which archs provide a 'working' (building, running ?) qtwebkit and try to testbuild this update on those... Landry
Re: postgresql readme
On Tue, Feb 11, 2020 at 09:02:48PM +, Stuart Henderson wrote:
> It's always annoying to look through postgresql.conf to figure out which
> things you've changed and which are default settings.
>
> Fortunately with postgresql-previous we have a default postgresql.conf
> that's likely to be close to the one in the old version, so we can diff it
> to give a better picture. It's not perfect because it may have changed
> slightly in a minor release, and initdb makes some locale-related
> changes when it copies the file to /var/postgresql/data, but it beats
> going through 700+ lines by eye.
>
> OK to add that to the pkg-readme?
>
ok pea@
> Index: Makefile
> ===
> RCS file: /cvs/ports/databases/postgresql/Makefile,v
> retrieving revision 1.259
> diff -u -p -r1.259 Makefile
> --- Makefile 9 Feb 2020 09:38:45 - 1.259
> +++ Makefile 11 Feb 2020 20:57:45 -
> @@ -16,7 +16,7 @@ PKGNAME-docs= postgresql-docs-${VERSION}
> PKGNAME-contrib=postgresql-contrib-${VERSION}
> PKGNAME-plpython=postgresql-plpython-${VERSION}
> PKGNAME-pg_upgrade=postgresql-pg_upgrade-${VERSION}
> -REVISION-server=0
> +REVISION-server= 1
>
> CATEGORIES= databases
> SHARED_LIBS= ecpg7.10 \
> Index: pkg/README-server
> ===
> RCS file: /cvs/ports/databases/postgresql/pkg/README-server,v
> retrieving revision 1.28
> diff -u -p -r1.28 README-server
> --- pkg/README-server 9 Feb 2020 09:38:45 - 1.28
> +++ pkg/README-server 11 Feb 2020 20:57:45 -
> @@ -131,7 +131,12 @@ to the current version.
> "cp /var/postgresql/data-${PREV_MAJOR}/server.{crt,key}
> /var/postgresql/data/"
>
> Some postgresql.conf settings changed or disappeared in this version.
> -Examine your old file for local changes and apply them to the new version.
> +Examine your old file for local changes and apply them to the new version
> +(/var/postgresql/data/postgresql.conf). The following command may help
> +identify them:
> +
> +# diff -wu
> ${LOCALBASE}/share/postgresql-${PREV_MAJOR}/postgresql.conf.sample \
> +/var/postgresql/data-${PREV_MAJOR}/postgresql.conf
>
> 7) Start PostgreSQL:
> # rcctl start postgresql
UPDATE devel/py-sip-4.19.18
Enclosed is another attempt to update devel/py-sip, this time to
4.19.18. Previous attempt [0] broke at least py-qt5, and has been
reverted. Updating to a newer version than 4.19.19 is unfortunately not
an option as it breaks all kinds of stuff (py-qt5 for example fails to
build).
Reason for wanting to update py-sip is that git-cola currently segfaults
on exit. This update fixes it.
I tested this update together with an update of py-qt5 (send in a
separate mail):
- Build tested:
devel/tortoisehg
geo/qgis
x11/kde4/py-kde
x11/py-qt4
x11/py-qt5
- Run tested:
devel/git-cola
devel/tortoisehg
geo/qgis
As my track record for this port is poor I think it makes sense to wait
until I have at least 2 OK's, preferably from heavy hitters.
Comments/OK?
[0] https://marc.info/?l=openbsd-ports&m=158093766318588&w=2
diff --git Makefile Makefile
index c9a03b65cf4..eb8b35bca70 100644
--- Makefile
+++ Makefile
@@ -5,13 +5,13 @@ COMMENT= automatically generate Python bindings for C
and C++ libs
# XXX py-sip updates FREQUENTLY break other ports
# XXX BE ESPECIALLY CAREFUL WHEN TESTING UPDATES!
-MODPY_EGG_VERSION =4.19.17
+MODPY_EGG_VERSION =4.19.18
EPOCH= 0
DISTNAME= sip-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
CATEGORIES=devel
-HOMEPAGE= https://www.riverbankcomputing.co.uk/software/sip/intro
+HOMEPAGE= https://www.riverbankcomputing.com/software/sip/intro
# SIP license (Python like)
PERMIT_PACKAGE=Yes
diff --git distinfo distinfo
index 0a2e060db81..d8c32130f79 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (sip-4.19.17.tar.gz) = ErzY9NX+78EFvAddEsUJDueD9zgHKFY8kbi5XQ7EXfM=
-SIZE (sip-4.19.17.tar.gz) = 1056156
+SHA256 (sip-4.19.18.tar.gz) = wL2GOADtmxXcrUd8QBfNtz+oBcJZCLAkBWSt101pfh4=
+SIZE (sip-4.19.18.tar.gz) = 1056840
diff --git patches/patch-configure_py patches/patch-configure_py
index 283d332e419..d3b91cc951d 100644
--- patches/patch-configure_py
+++ patches/patch-configure_py
@@ -3,7 +3,7 @@ $OpenBSD: patch-configure_py,v 1.3 2020/02/07 22:10:23 bket Exp
$
Index: configure.py
--- configure.py.orig
+++ configure.py
-@@ -269,7 +269,7 @@ def create_config(module, template, macros):
+@@ -270,7 +270,7 @@ def create_config(module, template, macros):
"sip_version": sip_version,
"sip_version_str": sip_version_str,
"platform": build_platform,
UPDATE x11/py-qt5-5.9.2
Enclosed diff brings py-qt5 to 5.9.2, which is a small step forward.
Moving past the 5.9 branch is an endeavour by itself, and will take a
bit of effort.
Tested on amd64 in combination with an update of py-sip (send in
separate mail):
- Build tested:
devel/git-cola
geo/qgis
math/veusz
textproc/calibre
www/weboob
- Run tested:
devel/git-cola
devel/spyder/spyder
geo/qgis
math/veusz
shells/py-qtconsole
textproc/calibre
www/weboob (weboob-config-qt)
Comments/OK?
diff --git Makefile Makefile
index 376011907ca..325785b9e82 100644
--- Makefile
+++ Makefile
@@ -2,14 +2,13 @@
COMMENT= python Qt5 bindings
-V= 5.9
+V= 5.9.2
DISTNAME= PyQt5_gpl-${V}
PKGNAME= py-qt5-${V}
-REVISION= 6
CATEGORIES=x11 devel
-HOMEPAGE= http://www.riverbankcomputing.co.uk/software/pyqt/intro
+HOMEPAGE= https://www.riverbankcomputing.com/software/pyqt/intro
MAINTAINER=KDE porting team
# GPLv3 with exceptions for use with certain named open-source licenses
diff --git distinfo distinfo
index 335109979cb..e9a91d11b98 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (PyQt5_gpl-5.9.tar.gz) = qw55mc8gLMcpYseK7+Rh0WSXs8GoKCq5Zq2QtssnEJY=
-SIZE (PyQt5_gpl-5.9.tar.gz) = 3097557
+SHA256 (PyQt5_gpl-5.9.2.tar.gz) = wZDaxZjJewETyl56N8ccYj8C0dcTCIrd+srErPpLg5Q=
+SIZE (PyQt5_gpl-5.9.2.tar.gz) = 3102848
diff --git patches/patch-configure_py patches/patch-configure_py
index 6f98c7b8802..b7896e1298b 100644
--- patches/patch-configure_py
+++ patches/patch-configure_py
@@ -1,7 +1,8 @@
$OpenBSD: patch-configure_py,v 1.2 2016/08/30 16:02:17 landry Exp $
configure.py.orig Mon Jul 25 15:55:28 2016
-+++ configure.py Tue Aug 9 07:49:53 2016
-@@ -1984,7 +1984,18 @@ def run_command(cmd, verbose):
+Index: configure.py
+--- configure.py.orig
configure.py
+@@ -1991,7 +1991,18 @@ def run_command(cmd, verbose):
""" Run a command and display the output if requested. cmd is the command
to run. verbose is set if the output is to be displayed.
"""
@@ -20,7 +21,7 @@ $OpenBSD: patch-configure_py,v 1.2 2016/08/30 16:02:17 landry
Exp $
if verbose:
sys.stdout.write(cmd + "\n")
-@@ -2689,7 +2700,7 @@ Type 'no' to decline the terms of the license.
+@@ -2733,7 +2744,7 @@ Type 'no' to decline the terms of the license.
sys.stdout.flush()
try:
diff --git pkg/PLIST pkg/PLIST
index da52f2ccbd4..d12521fc0f5 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -167,6 +167,10 @@
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxContainer/QAxContainermod.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxContainer/qaxbase.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxContainer/qaxobject.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxContainer/qaxwidget.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/QtAndroidExtrasmod.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/qandroidjniobject.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/qtandroid.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtBluetooth/
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtBluetooth/QtBluetoothmod.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtBluetooth/qbluetooth.sip
[macppc/hppa] Unbreak net/isc-dhcp
Hi,
I've found out that isc-dhcp build is broken in the current macppc bulk:
> stats.c:(.text+0x80c): undefined reference to `__atomic_store_8'
(and more)
With the below diff, it builds fine on macppc [0]. REVISION bump is not
needed, this new version never built on macppc. Also, it's needed to
pull gcc-libs explicitly because COMPILER_LANGS=c is set, and setting
LDFLAGS via MAKE_ENV does not work.
Comments/feedback are welcome :)
Charlène.
[0] https://bin.charlenew.xyz/isc-dhcp.log
Index: Makefile
===
RCS file: /cvs/ports/net/isc-dhcp/Makefile,v
retrieving revision 1.55
diff -u -p -u -p -r1.55 Makefile
--- Makefile24 Jan 2020 10:55:44 - 1.55
+++ Makefile12 Feb 2020 11:09:22 -
@@ -42,6 +42,13 @@ EXAMPLEDIR= share/examples/isc-dhcp
MAKE_ENV +=CC='${CC}'
+# Fix "undefined reference to `__atomic_store_8'"
+.if ${MACHINE_ARCH:Mpowerpc} || ${MACHINE_ARCH:Mhppa}
+WANTLIB += atomic
+LIB_DEPENDS += lang/gcc/${MODGCC4_VERSION},-libs
+MAKE_FLAGS += LDFLAGS="${LDFLAGS} -latomic"
+.endif
+
# because we may want to patch bind, you know
post-extract:
cd ${WRKDIST}/bind && tar zxf bind.tar.gz
UPDATE: devel/pcre2
Update to latest version, ok ? comments ? should it go on a bulk first ? Cheers Giovanni Index: Makefile === RCS file: /cvs/ports/devel/pcre2/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- Makefile12 Jul 2019 20:45:15 - 1.11 +++ Makefile12 Feb 2020 12:06:12 - @@ -2,7 +2,7 @@ COMMENT = perl-compatible regular expression library, version 2 -DISTNAME = pcre2-10.33 +DISTNAME = pcre2-10.34 SHARED_LIBS += pcre2-16 0.3 # 8.0 SHARED_LIBS += pcre2-32 0.3 # 8.0 Index: distinfo === RCS file: /cvs/ports/devel/pcre2/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo1 May 2019 21:47:27 - 1.5 +++ distinfo12 Feb 2020 12:06:12 - @@ -1,2 +1,2 @@ -SHA256 (pcre2-10.33.tar.gz) = 4uKJmpdIn8atGwzD2nlSx8ypkbSg99tmSbddlyECXTE= -SIZE (pcre2-10.33.tar.gz) = 2234905 +SHA256 (pcre2-10.34.tar.gz) = 2mq6e6JQnpGOQfT3RKWfpBokJcWaKYojLn/oVpHgA3k= +SIZE (pcre2-10.34.tar.gz) = 2271533
Re: postgresql readme
On 2020/02/12 07:25, Aham Brahmasmi wrote:
> > PKGNAME-pg_upgrade=postgresql-pg_upgrade-${VERSION}
> > -REVISION-server=0
> > +REVISION-server= 1
>
> Namaste Stuart,
>
> Thank you for the patch.
>
> Would it be preferable to remove the extra space after the equal sign in
> the REVISION-server line above?
It doesn't matter either way but I find it easier to read with the space
after.
Re: UPDATE: x11/qt5/qtwebkit
On 2020/02/12 10:57, Landry Breuil wrote: > One think we should make sure to check is arch coverage, ie check which > archs provide a 'working' (building, running ?) qtwebkit and try to > testbuild this update on those... FWIW the list for the in-tree version is: aarch64 amd64 i386 powerpc sparc64
Mark devel/py-unicorn BROKEN-sparc64
This has never built while I've been doing the sparc64 builds. I'd like to mark it BROKEN-sparc64 ok? --Kurt Index: Makefile === RCS file: /cvs/ports/devel/py-unicorn/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- Makefile5 Nov 2019 20:42:34 - 1.7 +++ Makefile12 Feb 2020 13:48:20 - @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.7 2019/11/05 20:42:34 cwen Exp $ +BROKEN-sparc64 = multiple definition of use_vis3_instructions + COMMENT = Unicorn CPU emulator engine MODPY_EGG_VERSION =1.0.1
Re: Mark devel/py-unicorn BROKEN-sparc64
On Wed, Feb 12, 2020 at 08:50:52AM -0500, Kurt Mosiejczuk wrote: > This has never built while I've been doing the sparc64 builds. OK kn
Re: WIP: Tor Browser 9.0.4
On Wed, Feb 12, 2020 at 10:54:19AM +0100, Landry Breuil wrote:
> On Wed, Feb 12, 2020 at 07:30:22AM +0100, clematis wrote:
> > On Tue, Feb 11, 2020 at 10:12:20PM +0100, Caspar Schutijser wrote:
> > > On Tue, Feb 11, 2020 at 03:23:03PM +0100, Landry Breuil wrote:
> > > > On Sat, Jan 11, 2020 at 03:43:06PM +0100, Caspar Schutijser wrote:
> > > > > On Fri, Jan 10, 2020 at 10:31:15AM +, Stuart Henderson wrote:
> > > > > > On 2019/12/28 09:07, Caspar Schutijser wrote:
> ok good, it's just that in mozilla land, build1 is "first release
> candidate", that's all - cf
> of course TB-browser might not use the same convention :)
FYI, here is the reply from Nicolas Vigier (@boklm torproject):
=== 8< ===
The naming convention is based on the git tag we are using:
src-firefox-tor-browser-${firefox_version}-${torbrowser_branch}-${n}-build${m}
${n} is a number that we increase if we rebase our patches. Usually we
don't rebase them on the same firefox version, so most of the time it
is '1'.
${m} is a number that we increase when we added new patches. A -build2
for example indicates that we did a first build, then added new patches
and did a second build (however only the last one is uploaded to
dist.tpo).
=== 8< ===
Also note that:
Release Candidates are uploaded under the ~/ of whoever is building it.
There should always be only one firefox source tarball for each Tor
Browser version on dist.tpo.
Caspar, if you are interested in this, Nicolas offered to send an email
out when they have a Release Candidate if you want to test build before
it gets released.
His complete email reply to tbb-dev:
https://lists.torproject.org/pipermail/tbb-dev/2020-February/001046.html
Thanks,
--
clematis (0x7e96fd2400fe7b59)
graphics/gimp crashes when opening a file dialog
on -current amd64 (gimp-2.10.14p1) the program crashes when I open a file dialog to open or save a file. On crash, Gimp opens a dialog to tell about the crashes, here is the output GNU Image Manipulation Program version 2.10.14 git-describe: GIMP_2_10_12-511-ga4f55d6c7e C compiler: OpenBSD clang version 8.0.1 (tags/RELEASE_801/final) (based on LLVM 8.0.1) Target: amd64-unknown-openbsd6.6 Thread model: posix InstalledDir: /usr/bin using babl version 0.1.74 (compiled against version 0.1.74) using GEGL version 0.4.20 (compiled against version 0.4.20) using GLib version 2.62.4 (compiled against version 2.62.4) using GdkPixbuf version 2.40.0 (compiled against version 2.40.0) using GTK+ version 2.24.32 (compiled against version 2.24.32) using Pango version 1.44.7 (compiled against version 1.44.7) using Fontconfig version 2.12.4 (compiled against version 2.12.4) using Cairo version 1.16.0 (compiled against version 1.16.0) > fatal error: Segmentation fault Stack trace: 0x1a49e4322be1 at /usr/local/lib/libgimpbase-2.0.so.273.0 0x1a47a8f7116c at gimp 0x1a47a8f70ff8 at gimp 0x1a47a8f71dad at gimp 0x1a49ba5ac005 0x1a4a355fdd76 at /usr/local/lib/gtk-2.0/2.10.0/engines/libpixmap.so 0x1a4a355fcfcd at /usr/local/lib/gtk-2.0/2.10.0/engines/libpixmap.so 0x1a4a355fbe88 at /usr/local/lib/gtk-2.0/2.10.0/engines/libpixmap.so 0x1a4a608427dc at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a4a6089e4bb at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a4a607abffe at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a49b1534d57 at /usr/local/lib/libgobject-2.0.so.4200.10 0x1a49b154df60 at /usr/local/lib/libgobject-2.0.so.4200.10 0x1a49b154ec30 at /usr/local/lib/libgobject-2.0.so.4200.10 0x1a49b154f2c1 at /usr/local/lib/libgobject-2.0.so.4200.10 0x1a4a60904607 at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a4a6070f30c at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a4a606d3cfc at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a4a6070f89d at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a4a607abffe at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a49b1534d57 at /usr/local/lib/libgobject-2.0.so.4200.10 0x1a49b154df60 at /usr/local/lib/libgobject-2.0.so.4200.10 0x1a49b154ec30 at /usr/local/lib/libgobject-2.0.so.4200.10 0x1a49b154f2c1 at /usr/local/lib/libgobject-2.0.so.4200.10 0x1a4a60904607 at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a4a6070f30c at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a4a607e0df9 at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a4a6070f89d at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a4a607e07d6 at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a4a607abffe at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a49b1534d57 at /usr/local/lib/libgobject-2.0.so.4200.10 0x1a49b154df60 at /usr/local/lib/libgobject-2.0.so.4200.10 0x1a49b154ec30 at /usr/local/lib/libgobject-2.0.so.4200.10 0x1a49b154f2c1 at /usr/local/lib/libgobject-2.0.so.4200.10 0x1a4a60904607 at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a4a6070f30c at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a4a606d3cfc at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a4a6070f89d at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a4a607abffe at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a49b1534d57 at /usr/local/lib/libgobject-2.0.so.4200.10 0x1a49b154df60 at /usr/local/lib/libgobject-2.0.so.4200.10 0x1a49b154ec30 at /usr/local/lib/libgobject-2.0.so.4200.10 0x1a49b154f2c1 at /usr/local/lib/libgobject-2.0.so.4200.10 0x1a4a60904607 at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a4a6070f30c at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a4a606d3cfc at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a4a6070f89d at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a4a607abffe at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a49b1534d57 at /usr/local/lib/libgobject-2.0.so.4200.10 0x1a49b154df60 at /usr/local/lib/libgobject-2.0.so.4200.10 0x1a49b154ec30 at /usr/local/lib/libgobject-2.0.so.4200.10 0x1a49b154f2c1 at /usr/local/lib/libgobject-2.0.so.4200.10 0x1a4a60904607 at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a4a6070f30c at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a4a606d3cfc at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a4a6070f89d at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a4a607abffe at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a49b1534d57 at /usr/local/lib/libgobject-2.0.so.4200.10 0x1a49b154df60 at /usr/local/lib/libgobject-2.0.so.4200.10 0x1a49b154ec30 at /usr/local/lib/libgobject-2.0.so.4200.10 0x1a49b154f2c1 at /usr/local/lib/libgobject-2.0.so.4200.10 0x1a4a60904607 at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a4a6070f30c at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a4a606d3cfc at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a4a6070f89d at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a4a607abffe at /usr/local/lib/libgtk-x11-2.0.so.2400.0 0x1a49b1534d57 at /usr/local/lib/libgobject-2.0.so.4200.10 0x1a49b154df60 at /usr/local/lib/libgobject-2.0.so.4200.10 0x1a49b154ec30 at /usr/local/lib/libgob
Re: graphics/gimp crashes when opening a file dialog
You'll get more information if you install debug-gimp/debug-glib2/debug-gtk+2 and do a backtrace in gdb instead. (Might still not be useful but at least there's some chance :-) On 2020/02/12 16:44, Solene Rapenne wrote: > on -current amd64 (gimp-2.10.14p1) the program crashes when I open a file > dialog to open or save a file. > > > On crash, Gimp opens a dialog to tell about the crashes, here is the output > > GNU Image Manipulation Program version 2.10.14 > git-describe: GIMP_2_10_12-511-ga4f55d6c7e > C compiler: > OpenBSD clang version 8.0.1 (tags/RELEASE_801/final) (based on LLVM 8.0.1) > Target: amd64-unknown-openbsd6.6 > Thread model: posix > InstalledDir: /usr/bin > > using babl version 0.1.74 (compiled against version 0.1.74) > using GEGL version 0.4.20 (compiled against version 0.4.20) > using GLib version 2.62.4 (compiled against version 2.62.4) > using GdkPixbuf version 2.40.0 (compiled against version 2.40.0) > using GTK+ version 2.24.32 (compiled against version 2.24.32) > using Pango version 1.44.7 (compiled against version 1.44.7) > using Fontconfig version 2.12.4 (compiled against version 2.12.4) > using Cairo version 1.16.0 (compiled against version 1.16.0) > > > fatal error: Segmentation fault > > Stack trace: > 0x1a49e4322be1 at > /usr/local/lib/libgimpbase-2.0.so.273.0 > 0x1a47a8f7116c at gimp > 0x1a47a8f70ff8 at gimp > 0x1a47a8f71dad at gimp > 0x1a49ba5ac005 > 0x1a4a355fdd76 at > /usr/local/lib/gtk-2.0/2.10.0/engines/libpixmap.so > 0x1a4a355fcfcd at > /usr/local/lib/gtk-2.0/2.10.0/engines/libpixmap.so > 0x1a4a355fbe88 at > /usr/local/lib/gtk-2.0/2.10.0/engines/libpixmap.so > 0x1a4a608427dc at /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a4a6089e4bb at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a4a607abffe at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a49b1534d57 at > /usr/local/lib/libgobject-2.0.so.4200.10 > 0x1a49b154df60 at > /usr/local/lib/libgobject-2.0.so.4200.10 > 0x1a49b154ec30 at > /usr/local/lib/libgobject-2.0.so.4200.10 > 0x1a49b154f2c1 at /usr/local/lib/libgobject-2.0.so.4200.10 > 0x1a4a60904607 at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a4a6070f30c at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a4a606d3cfc at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a4a6070f89d at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a4a607abffe at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a49b1534d57 at > /usr/local/lib/libgobject-2.0.so.4200.10 > 0x1a49b154df60 at > /usr/local/lib/libgobject-2.0.so.4200.10 > 0x1a49b154ec30 at > /usr/local/lib/libgobject-2.0.so.4200.10 > 0x1a49b154f2c1 at /usr/local/lib/libgobject-2.0.so.4200.10 > 0x1a4a60904607 at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a4a6070f30c at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a4a607e0df9 at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a4a6070f89d at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a4a607e07d6 at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a4a607abffe at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a49b1534d57 at > /usr/local/lib/libgobject-2.0.so.4200.10 > 0x1a49b154df60 at > /usr/local/lib/libgobject-2.0.so.4200.10 > 0x1a49b154ec30 at > /usr/local/lib/libgobject-2.0.so.4200.10 > 0x1a49b154f2c1 at /usr/local/lib/libgobject-2.0.so.4200.10 > 0x1a4a60904607 at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a4a6070f30c at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a4a606d3cfc at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a4a6070f89d at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a4a607abffe at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a49b1534d57 at > /usr/local/lib/libgobject-2.0.so.4200.10 > 0x1a49b154df60 at > /usr/local/lib/libgobject-2.0.so.4200.10 > 0x1a49b154ec30 at > /usr/local/lib/libgobject-2.0.so.4200.10 > 0x1a49b154f2c1 at /usr/local/lib/libgobject-2.0.so.4200.10 > 0x1a4a60904607 at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a4a6070f30c at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a4a606d3cfc at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a4a6070f89d at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a4a607abffe at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a49b1534d57 at > /usr/local/lib/libgobject-2.0.so.4200.10 > 0x1a49b154df60 at > /usr/local/lib/libgobject-2.0.so.4200.10 > 0x1a49b154ec30 at > /usr/local/lib/libgobject-2.0.so.4200.10 > 0x1a49b154f2c1 at /usr/local/lib/libgobject-2.0.so.4200.10 > 0x1a4a60904607 at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a4a6070f30c at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a4a606d3cfc at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a4a6070f89d at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a4a607abffe at > /usr/local/lib/libgtk-x11-2.0.so.2400.0 > 0x1a49b1534d57 at > /usr/local/lib/libgobject-2.0.so.4200.10 > 0x1a49b154df60 at > /usr/local/lib/libgobject-2.0.so.4200.10 > 0x1a49b154ec30 at > /usr/local/lib/libgobject-2.0.so.4200.10 > 0x1a49b154f2c1 at /
Re: graphics/gimp crashes when opening a file dialog
On Wed, Feb 12, 2020 at 04:16:52PM +, Stuart Henderson wrote: > You'll get more information if you install debug-gimp/debug-glib2/debug-gtk+2 > and do a backtrace in gdb instead. (Might still not be useful but at least > there's some chance :-) > > sure, I get this backtrace with egdb Thread 1 received signal SIGSEGV, Segmentation fault. 0x02c3bb5989f1 in compute_hint (pixbuf=, x0=, x1=24, y0=31, y1=32) at pixbuf-render.c:606 606 pixbuf-render.c: No such file or directory. (gdb) bt #0 0x02c3bb5989f1 in compute_hint (pixbuf=, x0=, x1=24, y0=31, y1=32) at pixbuf-render.c:606 #1 theme_pixbuf_compute_hints (theme_pb=) at pixbuf-render.c:696 #2 0x02c3bb598d76 in theme_pixbuf_get_pixbuf (theme_pb=0x2c3866d3f00) at pixbuf-render.c:759 #3 theme_pixbuf_render (theme_pb=0x2c3866d3f00, window=0x2c3d5748900, mask=0x0, clip_rect=0x2c3e8e44484, component_mask=512, center=0, x=10, y=475, width=148, height=24) at pixbuf-render.c:777 #4 0x02c3bb597fcd in draw_simple_image (style=, window=0x2c3d5748900, area=0x2c3e8e44484, widget=, match_data=, draw_center=1, allow_setbg=, x=10, y=475, width=927023101, height=23) at pixbuf-draw.c:145 #5 0x02c3bb596e88 in draw_box (style=0x2c454e0e810, window=0x2c3d5748900, state=GTK_STATE_NORMAL, shadow=GTK_SHADOW_NONE, area=0x2c3e8e44484, widget=0x2c3d5748850, detail=0x2c41c32642c "toolbar", x=10, y=475, width=148, height=24) at pixbuf-draw.c:668 #6 0x02c41c5b87dc in IA__gtk_paint_box (style=0x2c454e0e810, window=0x2c3d5748900, state_type=GTK_STATE_NORMAL, shadow_type=GTK_SHADOW_NONE, area=0x2c3e8e44484, widget=0x2c3d5748850, detail=0x2c41c32642c "toolbar", x=10, y=475, width=148, height=24) at gtkstyle.c:6207 #7 0x02c41c6144bb in gtk_toolbar_expose (widget=0x2c3d5748850, event=0x2c3e8e44470) at gtktoolbar.c:874 #8 0x02c41c521ffe in _gtk_marshal_BOOLEAN__BOXED (closure=0x2c39ce72620, return_value=0x7f7c8e80, n_param_values=, param_values=0x7f7c8f50, invocation_hint=, marshal_data=) at gtkmarshalers.c:84 #9 0x02c455228d57 in g_closure_invoke () from /usr/local/lib/libgobject-2.0.so.4200.10 #10 0x02c455241f60 in ?? () from /usr/local/lib/libgobject-2.0.so.4200.10 #11 0x02c455242c30 in g_signal_emit_valist () from /usr/local/lib/libgobject-2.0.so.4200.10 #12 0x02c4552432c1 in g_signal_emit () from /usr/local/lib/libgobject-2.0.so.4200.10 #13 0x02c41c67a607 in gtk_widget_event_internal (widget=0x2c3d5748850, event=0x2c3e8e44470) at gtkwidget.c:5010 #14 0x02c41c48530c in IA__gtk_container_propagate_expose (container=, child=0x2c3d5748850, event=0x2c3a20598b0) at gtkcontainer.c:2757 #15 0x02c41c449cfc in gtk_box_forall (container=0x2c40fa5d990, include_internals=, callback=0x2c41c486110 , callback_data=0x7f7c9250) at gtkbox.c:1251 #16 0x02c41c48589d in IA__gtk_container_forall (container=, callback=0x1f, callback_data=) at gtkcontainer.c:1507 #17 gtk_container_expose (widget=0x2c40fa5d990, event=) at gtkcontainer.c:2661 #18 0x02c41c521ffe in _gtk_marshal_BOOLEAN__BOXED (closure=0x2c39ce72620, return_value=0x7f7c9360, n_param_values=, param_values=0x7f7c9430, invocation_hint=, marshal_data=) at gtkmarshalers.c:84 #19 0x02c455228d57 in g_closure_invoke () from /usr/local/lib/libgobject-2.0.so.4200.10 #20 0x02c455241f60 in ?? () from /usr/local/lib/libgobject-2.0.so.4200.10 #21 0x02c455242c30 in g_signal_emit_valist () from /usr/local/lib/libgobject-2.0.so.4200.10 #22 0x02c4552432c1 in g_signal_emit () from /usr/local/lib/libgobject-2.0.so.4200.10 #23 0x02c41c67a607 in gtk_widget_event_internal (widget=0x2c40fa5d990, event=0x2c3a20598b0) at gtkwidget.c:5010 #24 0x02c41c48530c in IA__gtk_container_propagate_expose (container=, child=0x2c40fa5d990, event=0x2c43163cc80) at gtkcontainer.c:2757 #25 0x02c41c556df9 in gtk_paned_forall (container=0x2c3cc2002e0, include_internals=, callback=0x2c41c486110 , callback_data=0x7f7c9720) at gtkpaned.c:1462 #26 0x02c41c48589d in IA__gtk_container_forall (container=, callback=0x1f, callback_data=) at gtkcontainer.c:1507 #27 gtk_container_expose (widget=0x2c3cc2002e0, event=) at gtkcontainer.c:2661 #28 0x02c41c5567d6 in gtk_paned_expose (widget=0x2c3cc2002e0, event=0x2c43163cc80) at gtkpaned.c:1095 #29 0x02c41c521ffe in _gtk_marshal_BOOLEAN__BOXED (closure=0x2c39ce72620, return_value=0x7f7c9870, n_param_values=, param_values=0x7f7c9940, invocation_hint=, marshal_data=) at gtkmarshalers.c:84 #30 0x02c455228d57 in g_closure_invoke () from /usr/local/lib/libgobject-2.0.so.4200.10 #31 0x02c455241f60 in ?? () from /usr/local/lib/libgobject-2.0.so.4200.10 #32 0x02c455242c30 in g_signal_emit_valist () from /usr/local/lib/libgobject-2.0.so.4200.10 #33 0x02c4552432c1 in g_signal_emit () from /usr/local/lib/libgobject-2.0.so.4200.10 #34 0x02c41c67a607 in gtk_widget_event_internal (widget=0x2c3cc2002e0, event=0x2c43163cc80) at
Re: UPDATE: devel/pcre2
On 2020/02/12 13:15, Giovanni Bechis wrote: > Update to latest version, ok ? comments ? Please run update-patches, update-plist, and bump the shared library minor versions for all libraries. > should it go on a bulk first ? nope - even if it did have changes where testing dependent ports would help, there are only a handful, so there's no point in running a bulk when you can build separately easily enough. (It may make sense to look at the selinux-friendly jit which is likely to also work with openbsd's restrictions, but that's definitely not something to mix with the update :)
Re: WIP: Tor Browser 9.0.4
On Wed, Feb 12, 2020 at 03:22:04PM +0100, clematis wrote:
> On Wed, Feb 12, 2020 at 10:54:19AM +0100, Landry Breuil wrote:
> > On Wed, Feb 12, 2020 at 07:30:22AM +0100, clematis wrote:
> > > On Tue, Feb 11, 2020 at 10:12:20PM +0100, Caspar Schutijser wrote:
> > > > On Tue, Feb 11, 2020 at 03:23:03PM +0100, Landry Breuil wrote:
> > > > > On Sat, Jan 11, 2020 at 03:43:06PM +0100, Caspar Schutijser wrote:
> > > > > > On Fri, Jan 10, 2020 at 10:31:15AM +, Stuart Henderson wrote:
> > > > > > > On 2019/12/28 09:07, Caspar Schutijser wrote:
> > ok good, it's just that in mozilla land, build1 is "first release
> > candidate", that's all - cf
> > of course TB-browser might not use the same convention :)
>
> FYI, here is the reply from Nicolas Vigier (@boklm torproject):
>
> === 8< ===
> The naming convention is based on the git tag we are using:
>
> src-firefox-tor-browser-${firefox_version}-${torbrowser_branch}-${n}-build${m}
>
> ${n} is a number that we increase if we rebase our patches. Usually we
> don't rebase them on the same firefox version, so most of the time it
> is '1'.
>
> ${m} is a number that we increase when we added new patches. A -build2
> for example indicates that we did a first build, then added new patches
> and did a second build (however only the last one is uploaded to
> dist.tpo).
> === 8< ===
>
> Also note that:
> Release Candidates are uploaded under the ~/ of whoever is building it.
> There should always be only one firefox source tarball for each Tor
> Browser version on dist.tpo.
>
> Caspar, if you are interested in this, Nicolas offered to send an email
> out when they have a Release Candidate if you want to test build before
> it gets released.
>
> His complete email reply to tbb-dev:
> https://lists.torproject.org/pipermail/tbb-dev/2020-February/001046.html
Thanks for clearing that up and also for making sure it still builds
with Rust 1.41. For now, it is not necessary for me to receive an email
about release candidates.
Regarding Tor Browser 9.0.5, I'll probably send a diff for that during
the weekend.
Thanks,
Caspar Schutijser
Mark net/mutella BROKEN-sparc64
net/mutella has never built successfully while I've run sparc64 builds. ok to mark BROKEN-sparc64? --Kurt Index: Makefile === RCS file: /cvs/ports/net/mutella/Makefile,v retrieving revision 1.19 diff -u -p -r1.19 Makefile --- Makefile12 Jul 2019 20:48:32 - 1.19 +++ Makefile13 Feb 2020 02:42:46 - @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.19 2019/07/12 20:48:32 sthen Exp $ +BROKEN-sparc64=ISO C++ forbids converting a string constant to 'LPSTR' + COMMENT= gnutella client with an easy to use interface DISTNAME= mutella-0.4.5
Unbreak comms/xastir for sparc64 (and probably others)
This diff fixes the build of comms/xastir on sparc64. Previously the
necessary define wasn't getting passed along to the compiler. I switched
from playing with CONFIG_ENV to adding the necessary parts to CFLAGS
directly in the Makefile.
I've confirmed that it still builds on amd64 after this change.
ok?
(cc MAINTAINER)
--Kurt
Index: Makefile
===
RCS file: /cvs/ports/comms/xastir/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile10 Sep 2019 11:21:24 - 1.39
+++ Makefile13 Feb 2020 03:09:15 -
@@ -3,7 +3,7 @@
COMMENT= X amateur station tracking and info reporting
DISTNAME= xastir-2.0.6
-REVISION= 3
+REVISION= 4
CATEGORIES=comms hamradio geo
@@ -24,10 +24,10 @@ AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.11
MAKE_ENV+=MOTIFLIB='-L${LOCALBASE}/lib -lXm'
.if ${MACHINE} == "sparc64"
-MAKE_FLAGS=CFLAGS="${CFLAGS} -fno-tree-ter"
+CFLAGS += -fno-tree-ter
.endif
# https://github.com/Xastir/Xastir/issues/47 proj 6
-CONFIGURE_ENV += CFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
+CFLAGS += -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
CONFIGURE_ARGS=--with-shapelib
\
--with-pcre \
Re: [NEW] mail/aerc
On Wed, 12 Feb 2020 at 22:26:24 -0500, Raymond E. Pasco wrote:
> On Mon Feb 10, 2020 at 9:10 AM, Aaron Bieber wrote:
> > It looks good to me. I'd like to pass in MODGO_FLAGS so we can have
> > verbose
> > info when DEBUG is set. Something like:
> > MAKE_ENV += GOFLAGS="${MODGO_FLAGS}"
> >
> >
> > But it seems the "-p ${MAKE_JOBS}" bit from go.port.mk isn't getting
> > parsed
> > properly in this case.
>
> Go is being a real pain here. It seems to want the syntax to be -p=1
> rather than -p 1 - however, it only cares to *enforce* this when it's in
> the GOFLAGS environment variable and not when it's regular command line
> flags, as MODGO_FLAGS ordinarily are by go.port.mk. The below diff to
> go.port.mk makes it work, and doesn't break the couple other lang/go
> ports I tried; combined with the attached port it respects the flags.
>
> diff --git a/lang/go/go.port.mk b/lang/go/go.port.mk
> index 983c3990706..21bccbd7053 100644
> --- a/lang/go/go.port.mk
> +++ b/lang/go/go.port.mk
> @@ -67,7 +67,7 @@ MODGO_SETUP_WORKSPACE = mkdir -p ${WRKSRC:H}; mv
> ${MODGO_SUBDIR} ${WRKSRC};
> CATEGORIES += lang/go
>
> MODGO_BUILD_TARGET = ${MODGO_BUILD_CMD} ${ALL_TARGET}
> -MODGO_FLAGS += -v -p ${MAKE_JOBS}
> +MODGO_FLAGS += -v -p=${MAKE_JOBS}
>
> .if empty(DEBUG)
> # by default omit symbol table, debug information and DWARF symbol
> table
>
Tested a few ports with this (dnscontrol, gopass, ogvt, go-tools and a few
others that set MODGO_FLAGS), no issues found.
OK abieber@
--
PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
Unbreak emulators/fs-uae build on sparc64
This patch fixes the build for emulators/fs-uae for sparc64.
ok?
(cc maintainer)
--Kurt
Index: Makefile
===
RCS file: /cvs/ports/emulators/fs-uae/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile26 Jul 2019 22:00:42 - 1.33
+++ Makefile13 Feb 2020 04:55:00 -
@@ -7,7 +7,7 @@ V = 2.4.0
MODPY_EGG_VERSION =${V}
DISTNAME = fs-uae-$V
CATEGORIES = emulators
-REVISION = 10
+REVISION = 11
HOMEPAGE = https://fs-uae.net/
MAINTAINER = Edd Barrett
@@ -35,6 +35,10 @@ USE_GMAKE = Yes
.include
.if ${PROPERTIES:Mclang}
CXXFLAGS = -std=c++03
+.endif
+
+.if ${MACHINE} == "sparc64"
+CXXFLAGS +=-fpermissive
.endif
MAKE_FLAGS += prefix=${PREFIX} CXXFLAGS="${CXXFLAGS}"
[update] editors/{py-,}qscintilla 2.11.4
Hi,
minor updates to go along bket@'s py-qt/py-sip updates, the changelog
since 2.11.2 doesnt list many things (ie
https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.4/ChangeLog)
- built qgis and tortoisehg okay with it.
Landry
Index: Makefile
===
RCS file: /cvs/ports/editors/qscintilla/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile24 Jul 2019 08:49:43 - 1.24
+++ Makefile12 Feb 2020 15:49:27 -
@@ -3,9 +3,9 @@
COMMENT = Qt port of the Scintilla source code editor
# XXX update py-qscintilla alongside this port (same distfile).
-VERSION = 2.11.2
-DISTNAME = QScintilla_gpl-${VERSION}
-PKGNAME = qscintilla-${VERSION}
+VERSION = 2.11.4
+DISTNAME = QScintilla-${VERSION}
+PKGNAME = ${DISTNAME:L}
CATEGORIES = editors x11
Index: distinfo
===
RCS file: /cvs/ports/editors/qscintilla/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo24 Jul 2019 08:49:43 - 1.8
+++ distinfo12 Feb 2020 15:49:27 -
@@ -1,2 +1,2 @@
-SHA256 (QScintilla_gpl-2.11.2.tar.gz) =
ApvcR2oGn9os6jzZN7oZzH+mFPuQV4yu+Y7XA7ZY9KE=
-SIZE (QScintilla_gpl-2.11.2.tar.gz) = 2986600
+SHA256 (QScintilla-2.11.4.tar.gz) =
cj+PHRaG2fyPIEzYVTR+mEMi3VzXJ4kdMk0NfRh77iA=
+SIZE (QScintilla-2.11.4.tar.gz) = 3007719
Index: Makefile
===
RCS file: /cvs/ports/editors/py-qscintilla/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- Makefile24 Jul 2019 08:50:19 - 1.20
+++ Makefile12 Feb 2020 16:50:17 -
@@ -2,9 +2,10 @@
COMMENT = Python binding for the Scintilla source code editor
-VERSION = 2.11.2
-DISTNAME = QScintilla_gpl-${VERSION}
-PKGNAME = py-qscintilla-${VERSION}
+VERSION = 2.11.4
+MODPY_EGG_VERSION = ${VERSION}
+DISTNAME = QScintilla-${VERSION}
+PKGNAME = py-${DISTNAME:L}
CATEGORIES = editors x11 devel
HOMEPAGE = http://www.riverbankcomputing.com/software/qscintilla/
Index: distinfo
===
RCS file: /cvs/ports/editors/py-qscintilla/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo24 Jul 2019 08:50:19 - 1.6
+++ distinfo12 Feb 2020 16:50:17 -
@@ -1,2 +1,2 @@
-SHA256 (QScintilla_gpl-2.11.2.tar.gz) =
ApvcR2oGn9os6jzZN7oZzH+mFPuQV4yu+Y7XA7ZY9KE=
-SIZE (QScintilla_gpl-2.11.2.tar.gz) = 2986600
+SHA256 (QScintilla-2.11.4.tar.gz) =
cj+PHRaG2fyPIEzYVTR+mEMi3VzXJ4kdMk0NfRh77iA=
+SIZE (QScintilla-2.11.4.tar.gz) = 3007719
Index: pkg/PLIST
===
RCS file: /cvs/ports/editors/py-qscintilla/pkg/PLIST,v
retrieving revision 1.6
diff -u -r1.6 PLIST
--- pkg/PLIST 24 Jul 2019 08:50:19 - 1.6
+++ pkg/PLIST 12 Feb 2020 16:50:17 -
@@ -1,10 +1,10 @@
@comment $OpenBSD: PLIST,v 1.6 2019/07/24 08:50:19 landry Exp $
lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/Qsci.pyi
-lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/Qsci.so
-lib/python${MODPY_VERSION}/site-packages/QScintilla-2.11.2.dist-info/
-lib/python${MODPY_VERSION}/site-packages/QScintilla-2.11.2.dist-info/INSTALLER
-lib/python${MODPY_VERSION}/site-packages/QScintilla-2.11.2.dist-info/METADATA
-lib/python${MODPY_VERSION}/site-packages/QScintilla-2.11.2.dist-info/RECORD
+@so lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/Qsci.so
+lib/python${MODPY_VERSION}/site-packages/QScintilla-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/QScintilla-${MODPY_EGG_VERSION}.dist-info/INSTALLER
+lib/python${MODPY_VERSION}/site-packages/QScintilla-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/QScintilla-${MODPY_EGG_VERSION}.dist-info/RECORD
lib/${QTVER}/qsci/api/python/QScintilla2.api
${SIPDIR}/Qsci/
${SIPDIR}/Qsci/qsciabstractapis.sip
Re: UPDATE devel/py-sip-4.19.18
On Wed Feb 12, 2020 at 12:16:00PM +0100, Björn Ketelaars wrote:
> Enclosed is another attempt to update devel/py-sip, this time to
> 4.19.18. Previous attempt [0] broke at least py-qt5, and has been
> reverted. Updating to a newer version than 4.19.19 is unfortunately not
> an option as it breaks all kinds of stuff (py-qt5 for example fails to
> build).
>
> Reason for wanting to update py-sip is that git-cola currently segfaults
> on exit. This update fixes it.
>
> I tested this update together with an update of py-qt5 (send in a
> separate mail):
> - Build tested:
> devel/tortoisehg
> geo/qgis
> x11/kde4/py-kde
> x11/py-qt4
> x11/py-qt5
> - Run tested:
> devel/git-cola
> devel/tortoisehg
> geo/qgis
>
> As my track record for this port is poor I think it makes sense to wait
> until I have at least 2 OK's, preferably from heavy hitters.
>
> Comments/OK?
>
> [0] https://marc.info/?l=openbsd-ports&m=158093766318588&w=2
>
>
> diff --git Makefile Makefile
> index c9a03b65cf4..eb8b35bca70 100644
> --- Makefile
> +++ Makefile
> @@ -5,13 +5,13 @@ COMMENT=automatically generate Python bindings for C
> and C++ libs
> # XXX py-sip updates FREQUENTLY break other ports
> # XXX BE ESPECIALLY CAREFUL WHEN TESTING UPDATES!
>
> -MODPY_EGG_VERSION = 4.19.17
> +MODPY_EGG_VERSION = 4.19.18
> EPOCH= 0
After the revert we need a EPOCH bump, otherwise OK rsadowski@ (Please
wait, maybe somebody will raise their hand)
> DISTNAME=sip-${MODPY_EGG_VERSION}
> PKGNAME= py-${DISTNAME}
> CATEGORIES= devel
>
> -HOMEPAGE=https://www.riverbankcomputing.co.uk/software/sip/intro
> +HOMEPAGE=https://www.riverbankcomputing.com/software/sip/intro
>
> # SIP license (Python like)
> PERMIT_PACKAGE= Yes
> diff --git distinfo distinfo
> index 0a2e060db81..d8c32130f79 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (sip-4.19.17.tar.gz) = ErzY9NX+78EFvAddEsUJDueD9zgHKFY8kbi5XQ7EXfM=
> -SIZE (sip-4.19.17.tar.gz) = 1056156
> +SHA256 (sip-4.19.18.tar.gz) = wL2GOADtmxXcrUd8QBfNtz+oBcJZCLAkBWSt101pfh4=
> +SIZE (sip-4.19.18.tar.gz) = 1056840
> diff --git patches/patch-configure_py patches/patch-configure_py
> index 283d332e419..d3b91cc951d 100644
> --- patches/patch-configure_py
> +++ patches/patch-configure_py
> @@ -3,7 +3,7 @@ $OpenBSD: patch-configure_py,v 1.3 2020/02/07 22:10:23 bket
> Exp $
> Index: configure.py
> --- configure.py.orig
> +++ configure.py
> -@@ -269,7 +269,7 @@ def create_config(module, template, macros):
> +@@ -270,7 +270,7 @@ def create_config(module, template, macros):
> "sip_version": sip_version,
> "sip_version_str": sip_version_str,
> "platform": build_platform,
>
Re: UPDATE x11/py-qt5-5.9.2
On Wed Feb 12, 2020 at 12:17:03PM +0100, Björn Ketelaars wrote:
> Enclosed diff brings py-qt5 to 5.9.2, which is a small step forward.
> Moving past the 5.9 branch is an endeavour by itself, and will take a
> bit of effort.
>
> Tested on amd64 in combination with an update of py-sip (send in
> separate mail):
> - Build tested:
> devel/git-cola
> geo/qgis
> math/veusz
> textproc/calibre
> www/weboob
> - Run tested:
> devel/git-cola
> devel/spyder/spyder
> geo/qgis
> math/veusz
> shells/py-qtconsole
> textproc/calibre
> www/weboob (weboob-config-qt)
>
> Comments/OK?
No objection, 5.13+ is for post 6.7.
>
>
> diff --git Makefile Makefile
> index 376011907ca..325785b9e82 100644
> --- Makefile
> +++ Makefile
> @@ -2,14 +2,13 @@
>
> COMMENT = python Qt5 bindings
>
> -V= 5.9
> +V= 5.9.2
> DISTNAME=PyQt5_gpl-${V}
> PKGNAME= py-qt5-${V}
> -REVISION=6
>
> CATEGORIES= x11 devel
>
> -HOMEPAGE=http://www.riverbankcomputing.co.uk/software/pyqt/intro
> +HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/intro
> MAINTAINER= KDE porting team
>
> # GPLv3 with exceptions for use with certain named open-source licenses
> diff --git distinfo distinfo
> index 335109979cb..e9a91d11b98 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (PyQt5_gpl-5.9.tar.gz) = qw55mc8gLMcpYseK7+Rh0WSXs8GoKCq5Zq2QtssnEJY=
> -SIZE (PyQt5_gpl-5.9.tar.gz) = 3097557
> +SHA256 (PyQt5_gpl-5.9.2.tar.gz) =
> wZDaxZjJewETyl56N8ccYj8C0dcTCIrd+srErPpLg5Q=
> +SIZE (PyQt5_gpl-5.9.2.tar.gz) = 3102848
> diff --git patches/patch-configure_py patches/patch-configure_py
> index 6f98c7b8802..b7896e1298b 100644
> --- patches/patch-configure_py
> +++ patches/patch-configure_py
> @@ -1,7 +1,8 @@
> $OpenBSD: patch-configure_py,v 1.2 2016/08/30 16:02:17 landry Exp $
> configure.py.origMon Jul 25 15:55:28 2016
> -+++ configure.py Tue Aug 9 07:49:53 2016
> -@@ -1984,7 +1984,18 @@ def run_command(cmd, verbose):
> +Index: configure.py
> +--- configure.py.orig
> configure.py
> +@@ -1991,7 +1991,18 @@ def run_command(cmd, verbose):
> """ Run a command and display the output if requested. cmd is the
> command
> to run. verbose is set if the output is to be displayed.
> """
> @@ -20,7 +21,7 @@ $OpenBSD: patch-configure_py,v 1.2 2016/08/30 16:02:17
> landry Exp $
> if verbose:
> sys.stdout.write(cmd + "\n")
>
> -@@ -2689,7 +2700,7 @@ Type 'no' to decline the terms of the license.
> +@@ -2733,7 +2744,7 @@ Type 'no' to decline the terms of the license.
> sys.stdout.flush()
>
> try:
> diff --git pkg/PLIST pkg/PLIST
> index da52f2ccbd4..d12521fc0f5 100644
> --- pkg/PLIST
> +++ pkg/PLIST
> @@ -167,6 +167,10 @@
> share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxContainer/QAxContainermod.sip
> share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxContainer/qaxbase.sip
> share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxContainer/qaxobject.sip
> share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxContainer/qaxwidget.sip
> +share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/
> +share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/QtAndroidExtrasmod.sip
> +share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/qandroidjniobject.sip
> +share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/qtandroid.sip
> share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtBluetooth/
> share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtBluetooth/QtBluetoothmod.sip
> share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtBluetooth/qbluetooth.sip
>
Re: UPDATE: devel/pcre2
On Wed, Feb 12, 2020 at 06:26:35PM +, Stuart Henderson wrote:
> On 2020/02/12 13:15, Giovanni Bechis wrote:
> > Update to latest version, ok ? comments ?
>
> Please run update-patches, update-plist, and bump the shared library minor
> versions for all libraries.
>
new diff follows
> > should it go on a bulk first ?
>
> nope - even if it did have changes where testing dependent ports would
> help, there are only a handful, so there's no point in running a bulk
> when you can build separately easily enough.
>
> (It may make sense to look at the selinux-friendly jit which is likely to
> also work with openbsd's restrictions, but that's definitely not something
> to mix with the update :)
this is another story ;-)
Giovanni
Index: Makefile
===
RCS file: /cvs/ports/devel/pcre2/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile12 Jul 2019 20:45:15 - 1.11
+++ Makefile13 Feb 2020 07:30:03 -
@@ -2,12 +2,12 @@
COMMENT = perl-compatible regular expression library, version 2
-DISTNAME = pcre2-10.33
+DISTNAME = pcre2-10.34
-SHARED_LIBS += pcre2-16 0.3 # 8.0
-SHARED_LIBS += pcre2-32 0.3 # 8.0
-SHARED_LIBS += pcre2-8 0.4 # 8.0
-SHARED_LIBS += pcre2-posix 0.3 # 2.2
+SHARED_LIBS += pcre2-16 0.4 # 8.0
+SHARED_LIBS += pcre2-32 0.4 # 8.0
+SHARED_LIBS += pcre2-8 0.5 # 8.0
+SHARED_LIBS += pcre2-posix 0.4 # 2.2
CATEGORIES = devel
Index: distinfo
===
RCS file: /cvs/ports/devel/pcre2/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo1 May 2019 21:47:27 - 1.5
+++ distinfo13 Feb 2020 07:30:03 -
@@ -1,2 +1,2 @@
-SHA256 (pcre2-10.33.tar.gz) = 4uKJmpdIn8atGwzD2nlSx8ypkbSg99tmSbddlyECXTE=
-SIZE (pcre2-10.33.tar.gz) = 2234905
+SHA256 (pcre2-10.34.tar.gz) = 2mq6e6JQnpGOQfT3RKWfpBokJcWaKYojLn/oVpHgA3k=
+SIZE (pcre2-10.34.tar.gz) = 2271533
Index: patches/patch-RunGrepTest
===
RCS file: /cvs/ports/devel/pcre2/patches/patch-RunGrepTest,v
retrieving revision 1.2
diff -u -p -r1.2 patch-RunGrepTest
--- patches/patch-RunGrepTest 1 May 2019 21:47:27 - 1.2
+++ patches/patch-RunGrepTest 13 Feb 2020 07:30:03 -
@@ -5,7 +5,7 @@ Our sed(1) doesn't cope with NUL bytes a
Index: RunGrepTest
--- RunGrepTest.orig
+++ RunGrepTest
-@@ -723,9 +723,9 @@ $valgrind $vjs $pcre2grep -n --newline=anycrlf "^(abc|
+@@ -740,9 +740,9 @@ $valgrind $vjs $pcre2grep -n --newline=anycrlf "^(abc|
printf '%c--- Test N7
--\r\n' - >>testtrygrep
uname=`uname`
case $uname in
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/pcre2/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 1 May 2019 21:47:27 - 1.4
+++ pkg/PLIST 13 Feb 2020 07:30:03 -
@@ -4,16 +4,16 @@ bin/pcre2-config
@bin bin/pcre2test
include/pcre2.h
include/pcre2posix.h
-lib/libpcre2-16.a
+@static-lib lib/libpcre2-16.a
lib/libpcre2-16.la
@lib lib/libpcre2-16.so.${LIBpcre2-16_VERSION}
-lib/libpcre2-32.a
+@static-lib lib/libpcre2-32.a
lib/libpcre2-32.la
@lib lib/libpcre2-32.so.${LIBpcre2-32_VERSION}
-lib/libpcre2-8.a
+@static-lib lib/libpcre2-8.a
lib/libpcre2-8.la
@lib lib/libpcre2-8.so.${LIBpcre2-8_VERSION}
-lib/libpcre2-posix.a
+@static-lib lib/libpcre2-posix.a
lib/libpcre2-posix.la
@lib lib/libpcre2-posix.so.${LIBpcre2-posix_VERSION}
lib/pkgconfig/libpcre2-16.pc
@@ -43,6 +43,7 @@ lib/pkgconfig/libpcre2-posix.pc
@man man/man3/pcre2_general_context_free.3
@man man/man3/pcre2_get_error_message.3
@man man/man3/pcre2_get_mark.3
+@man man/man3/pcre2_get_match_data_size.3
@man man/man3/pcre2_get_ovector_count.3
@man man/man3/pcre2_get_ovector_pointer.3
@man man/man3/pcre2_get_startchar.3
@@ -53,6 +54,7 @@ lib/pkgconfig/libpcre2-posix.pc
@man man/man3/pcre2_jit_stack_create.3
@man man/man3/pcre2_jit_stack_free.3
@man man/man3/pcre2_maketables.3
+@man man/man3/pcre2_maketables_free.3
@man man/man3/pcre2_match.3
@man man/man3/pcre2_match_context_copy.3
@man man/man3/pcre2_match_context_create.3
@@ -144,6 +146,7 @@ share/doc/pcre2/html/pcre2_general_conte
share/doc/pcre2/html/pcre2_general_context_free.html
share/doc/pcre2/html/pcre2_get_error_message.html
share/doc/pcre2/html/pcre2_get_mark.html
+share/doc/pcre2/html/pcre2_get_match_data_size.html
share/doc/pcre2/html/pcre2_get_ovector_count.html
share/doc/pcre2/html/pcre2_get_ovector_pointer.html
share/doc/pcre2/html/pcre2_get_startchar.html
@@ -154,6 +157,7 @@ share/doc/pcre2/html/pcre2_jit_stack_ass
share/doc/pcre2/html/pcre2_jit_stack_create.html
share/doc/pcre2/html/pcre2_jit_stack_free.html
share/doc/pcre2/html
Re: WIP: Tor Browser 9.0.4
On Wed, Feb 12, 2020 at 09:02:08PM +0100, Caspar Schutijser wrote:
> On Wed, Feb 12, 2020 at 03:22:04PM +0100, clematis wrote:
> > On Wed, Feb 12, 2020 at 10:54:19AM +0100, Landry Breuil wrote:
> > > On Wed, Feb 12, 2020 at 07:30:22AM +0100, clematis wrote:
> > > > On Tue, Feb 11, 2020 at 10:12:20PM +0100, Caspar Schutijser wrote:
> > > > > On Tue, Feb 11, 2020 at 03:23:03PM +0100, Landry Breuil wrote:
> > > > > > On Sat, Jan 11, 2020 at 03:43:06PM +0100, Caspar Schutijser wrote:
> > > > > > > On Fri, Jan 10, 2020 at 10:31:15AM +, Stuart Henderson wrote:
> > > > > > > > On 2019/12/28 09:07, Caspar Schutijser wrote:
> > > ok good, it's just that in mozilla land, build1 is "first release
> > > candidate", that's all - cf
> > > of course TB-browser might not use the same convention :)
> >
> > FYI, here is the reply from Nicolas Vigier (@boklm torproject):
> >
> > === 8< ===
> > The naming convention is based on the git tag we are using:
> >
> > src-firefox-tor-browser-${firefox_version}-${torbrowser_branch}-${n}-build${m}
> >
> > ${n} is a number that we increase if we rebase our patches. Usually we
> > don't rebase them on the same firefox version, so most of the time it
> > is '1'.
> >
> > ${m} is a number that we increase when we added new patches. A -build2
> > for example indicates that we did a first build, then added new patches
> > and did a second build (however only the last one is uploaded to
> > dist.tpo).
> > === 8< ===
> >
> > Also note that:
> > Release Candidates are uploaded under the ~/ of whoever is building it.
> > There should always be only one firefox source tarball for each Tor
> > Browser version on dist.tpo.
> >
> > Caspar, if you are interested in this, Nicolas offered to send an email
> > out when they have a Release Candidate if you want to test build before
> > it gets released.
> >
> > His complete email reply to tbb-dev:
> > https://lists.torproject.org/pipermail/tbb-dev/2020-February/001046.html
>
> Thanks for clearing that up and also for making sure it still builds
> with Rust 1.41. For now, it is not necessary for me to receive an email
> about release candidates.
>
> Regarding Tor Browser 9.0.5, I'll probably send a diff for that during
> the weekend.
In the meantime i've commited the 9.0.4 update, after all its been
waiting since last year... some minor nits after the fact (that you can
address in the 9.0.5 update):
- usr/local shouldnt be hardcoded in
patch-browser_extensions_tor-launcher_src_defaults_preferences_torlauncher-prefs_js,
usually you patch with ${LOCALBASE} and then use ${SUBST_CMD} in
post-patch to set the 'real' value.
- from my understanding this will enable the pledge codepaths, or not ?
i didnt see anything configuring pledge strings (as it was in 72 that
they moved to files)
- i suppose you blindly added patch-config_system-headers_mozbuild to
give a chance to arm64 to build ?
besides that, thanks for the hard work ! I think (if you want so) you
should take maintainership for this port so that it gets updates.. sean,
can you at least acknowledge this mail ?
Landry
>
> Thanks,
> Caspar Schutijser
>
rm -rf www/icedtea-web ?
Hi, I am not using it anymore and Java applets are dead, ok to remove or should I just drop maintainership ? Giovanni
Re: [update] editors/{py-,}qscintilla 2.11.4
On Thu Feb 13, 2020 at 08:19:39AM +0100, Landry Breuil wrote:
> Hi,
>
> minor updates to go along bket@'s py-qt/py-sip updates, the changelog
> since 2.11.2 doesnt list many things (ie
> https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.4/ChangeLog)
> - built qgis and tortoisehg okay with it.
Please switch the homepage to https, otherwise no objection.
RS
>
> Landry
> Index: Makefile
> ===
> RCS file: /cvs/ports/editors/qscintilla/Makefile,v
> retrieving revision 1.24
> diff -u -r1.24 Makefile
> --- Makefile 24 Jul 2019 08:49:43 - 1.24
> +++ Makefile 12 Feb 2020 15:49:27 -
> @@ -3,9 +3,9 @@
> COMMENT =Qt port of the Scintilla source code editor
>
> # XXX update py-qscintilla alongside this port (same distfile).
> -VERSION =2.11.2
> -DISTNAME = QScintilla_gpl-${VERSION}
> -PKGNAME =qscintilla-${VERSION}
> +VERSION =2.11.4
> +DISTNAME = QScintilla-${VERSION}
> +PKGNAME =${DISTNAME:L}
> CATEGORIES = editors x11
>
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/editors/qscintilla/distinfo,v
> retrieving revision 1.8
> diff -u -r1.8 distinfo
> --- distinfo 24 Jul 2019 08:49:43 - 1.8
> +++ distinfo 12 Feb 2020 15:49:27 -
> @@ -1,2 +1,2 @@
> -SHA256 (QScintilla_gpl-2.11.2.tar.gz) =
> ApvcR2oGn9os6jzZN7oZzH+mFPuQV4yu+Y7XA7ZY9KE=
> -SIZE (QScintilla_gpl-2.11.2.tar.gz) = 2986600
> +SHA256 (QScintilla-2.11.4.tar.gz) =
> cj+PHRaG2fyPIEzYVTR+mEMi3VzXJ4kdMk0NfRh77iA=
> +SIZE (QScintilla-2.11.4.tar.gz) = 3007719
> Index: Makefile
> ===
> RCS file: /cvs/ports/editors/py-qscintilla/Makefile,v
> retrieving revision 1.20
> diff -u -r1.20 Makefile
> --- Makefile 24 Jul 2019 08:50:19 - 1.20
> +++ Makefile 12 Feb 2020 16:50:17 -
> @@ -2,9 +2,10 @@
>
> COMMENT =Python binding for the Scintilla source code editor
>
> -VERSION =2.11.2
> -DISTNAME = QScintilla_gpl-${VERSION}
> -PKGNAME =py-qscintilla-${VERSION}
> +VERSION = 2.11.4
> +MODPY_EGG_VERSION = ${VERSION}
> +DISTNAME = QScintilla-${VERSION}
> +PKGNAME =py-${DISTNAME:L}
> CATEGORIES = editors x11 devel
>
> HOMEPAGE = http://www.riverbankcomputing.com/software/qscintilla/
> Index: distinfo
> ===
> RCS file: /cvs/ports/editors/py-qscintilla/distinfo,v
> retrieving revision 1.6
> diff -u -r1.6 distinfo
> --- distinfo 24 Jul 2019 08:50:19 - 1.6
> +++ distinfo 12 Feb 2020 16:50:17 -
> @@ -1,2 +1,2 @@
> -SHA256 (QScintilla_gpl-2.11.2.tar.gz) =
> ApvcR2oGn9os6jzZN7oZzH+mFPuQV4yu+Y7XA7ZY9KE=
> -SIZE (QScintilla_gpl-2.11.2.tar.gz) = 2986600
> +SHA256 (QScintilla-2.11.4.tar.gz) =
> cj+PHRaG2fyPIEzYVTR+mEMi3VzXJ4kdMk0NfRh77iA=
> +SIZE (QScintilla-2.11.4.tar.gz) = 3007719
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/editors/py-qscintilla/pkg/PLIST,v
> retrieving revision 1.6
> diff -u -r1.6 PLIST
> --- pkg/PLIST 24 Jul 2019 08:50:19 - 1.6
> +++ pkg/PLIST 12 Feb 2020 16:50:17 -
> @@ -1,10 +1,10 @@
> @comment $OpenBSD: PLIST,v 1.6 2019/07/24 08:50:19 landry Exp $
> lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/Qsci.pyi
> -lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/Qsci.so
> -lib/python${MODPY_VERSION}/site-packages/QScintilla-2.11.2.dist-info/
> -lib/python${MODPY_VERSION}/site-packages/QScintilla-2.11.2.dist-info/INSTALLER
> -lib/python${MODPY_VERSION}/site-packages/QScintilla-2.11.2.dist-info/METADATA
> -lib/python${MODPY_VERSION}/site-packages/QScintilla-2.11.2.dist-info/RECORD
> +@so lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/Qsci.so
> +lib/python${MODPY_VERSION}/site-packages/QScintilla-${MODPY_EGG_VERSION}.dist-info/
> +lib/python${MODPY_VERSION}/site-packages/QScintilla-${MODPY_EGG_VERSION}.dist-info/INSTALLER
> +lib/python${MODPY_VERSION}/site-packages/QScintilla-${MODPY_EGG_VERSION}.dist-info/METADATA
> +lib/python${MODPY_VERSION}/site-packages/QScintilla-${MODPY_EGG_VERSION}.dist-info/RECORD
> lib/${QTVER}/qsci/api/python/QScintilla2.api
> ${SIPDIR}/Qsci/
> ${SIPDIR}/Qsci/qsciabstractapis.sip
