Re: UPDATE: inputmethods/uim
On Thu, Mar 7, 2019 at 1:38 AM Anthony J. Bentley wrote: > On Wed, Dec 19, 2018 at 1:02 AM Anthony J. Bentley wrote: > > On Mon, Dec 10, 2018 at 1:21 AM Anthony J. Bentley > > wrote: > > > Here is an update to uim-1.8.8. > > > > > > Release notes: https://github.com/uim/uim/releases > > > > So, ok for the attached libgcroots port and uim update? > > Ping. Updated libgcroots tarball with an updated arm64 patch (thanks sthen). -- Anthony J. Bentley libgcroots.tar.gz Description: application/gzip Index: Makefile === RCS file: /cvs/ports/inputmethods/uim/Makefile,v retrieving revision 1.62 diff -u -p -r1.62 Makefile --- Makefile 24 Oct 2018 14:28:06 - 1.62 +++ Makefile 16 Dec 2018 23:58:19 - @@ -11,7 +11,7 @@ COMMENT-qt4= uim for QT4 CATEGORIES= inputmethods japanese chinese -V= 1.8.6 +V= 1.8.8 DISTNAME= uim-$V PKGNAME-main= uim-$V PKGNAME-gtk= uim-gtk-$V @@ -19,14 +19,12 @@ PKGNAME-gtk3= uim-gtk3-$V PKGNAME-kde= uim-kde-$V PKGNAME-qt= uim-qt-$V PKGNAME-qt4= uim-qt4-$V -REVISION= 8 -MASTER_SITES= https://github.com/uim/uim/releases/download/uim-$V/ +MASTER_SITES= https://github.com/uim/uim/releases/download/$V/ HOMEPAGE= https://github.com/uim/uim -SHARED_LIBS += gcroots 0.0 # .1.0 SHARED_LIBS += uim-scm 0.0 # .0.0 -SHARED_LIBS += uim 1.0 # .6.0 +SHARED_LIBS += uim 1.1 # .6.0 SHARED_LIBS += uim-custom 0.0 # .2.0 # BSD @@ -46,11 +44,12 @@ USE_GMAKE= Yes RUN_DEPENDS-main= devel/desktop-file-utils -WANTLIB-main += ${cWANTLIB} -WANTLIB-main += Xft anthy anthydic c curses expat ${COMPILER_LIBCXX} -WANTLIB-main += util xcb z +WANTLIB-main += ${cWANTLIB} ${COMPILER_LIBCXX} +WANTLIB-main += Xft anthy anthydic c curses edit expat gcroots +WANTLIB-main += sqlite3 util xcb z -LIB_DEPENDS-main= inputmethods/anthy +LIB_DEPENDS-main= inputmethods/anthy \ + devel/libgcroots WANTLIB-gtk += ${cWANTLIB} @@ -58,7 +57,7 @@ WANTLIB-gtk += Xcomposite Xcursor Xdamag WANTLIB-gtk += atk-1.0 c cairo expat ffi gcroots gdk-x11-2.0 gdk_pixbuf-2.0 WANTLIB-gtk += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2 WANTLIB-gtk += gthread-2.0 gtk-x11-2.0 harfbuzz pango-1.0 pangocairo-1.0 -WANTLIB-gtk += pangoft2-1.0 pcre pixman-1 png pthread +WANTLIB-gtk += pangoft2-1.0 pcre pixman-1 png pthread fribidi WANTLIB-gtk += uim uim-custom uim-scm xcb xcb-render xcb-shm z LIB_DEPENDS-gtk= inputmethods/uim \ @@ -66,11 +65,11 @@ LIB_DEPENDS-gtk= inputmethods/uim \ WANTLIB-gtk3 += ${cWANTLIB} WANTLIB-gtk3 += Xcomposite Xcursor Xdamage Xfixes Xi Xinerama -WANTLIB-gtk3 += Xrandr Xtst atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject +WANTLIB-gtk3 += Xrandr atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject WANTLIB-gtk3 += dbus-1 expat ffi gcroots gdk-3 gdk_pixbuf-2.0 gio-2.0 WANTLIB-gtk3 += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 WANTLIB-gtk3 += gtk-3 harfbuzz pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB-gtk3 += pcre pixman-1 png pthread uim uim-custom +WANTLIB-gtk3 += pcre pixman-1 png pthread uim uim-custom fribidi WANTLIB-gtk3 += uim-scm xcb xcb-render xcb-shm z epoxy LIB_DEPENDS-gtk3= inputmethods/uim \ @@ -81,6 +80,7 @@ WANTLIB-kde += DCOP GL ICE SM X11-xcb Xc WANTLIB-kde += Xft Xi Xinerama Xmu Xrandr Xt Xxf86vm art_lgpl_2 drm WANTLIB-kde += expat gcroots glapi idn jpeg kdefx lcms mng png pthread WANTLIB-kde += qt-mt ${COMPILER_LIBCXX} uim uim-scm util xcb xcb-dri2 +WANTLIB-kde += xcb-dri3 xcb-present xcb-sync xcb-xfixes xshmfence WANTLIB-kde += xcb-glx z LIB_DEPENDS-kde= inputmethods/uim \ @@ -91,6 +91,7 @@ WANTLIB-qt += GL ICE SM X11-xcb Xcursor WANTLIB-qt += Xft Xi Xinerama Xmu Xrandr Xt Xxf86vm c drm expat gcroots WANTLIB-qt += glapi jpeg lcms mng png pthread ${COMPILER_LIBCXX} WANTLIB-qt += uim uim-custom uim-scm xcb xcb-dri2 xcb-glx z +WANTLIB-qt += xcb-dri3 xcb-present xcb-sync xcb-xfixes xshmfence LIB_DEPENDS-qt= ${MODQT3_LIB_DEPENDS} \ inputmethods/uim @@ -102,7 +103,7 @@ WANTLIB-qt4 += uim-custom uim-scm LIB_DEPENDS-qt4= ${MODQT4_LIB_DEPENDS} \ inputmethods/uim -AUTOCONF_VERSION= 2.68 +AUTOCONF_VERSION= 2.69 CONFIGURE_STYLE= autoconf CONFIGURE_ENV= CPPFLAGS='-I${MODQT3_INCDIR} -I${LOCALBASE}/include -I${X11BASE}/include' \ @@ -114,7 +115,8 @@ CONFIGURE_ARGS= --with-qt \ --with-qt-immodule \ --with-qt4 \ --with-qt4-immodule \ - --with-anthy-utf8 + --with-anthy-utf8 \ + --with-libgcroots post-install: rm ${PREFIX}/lib/uim/plugin/*.{a,la} Index: distinfo === RCS file: /cvs/ports/inputmethods/uim/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo 9 Jan 2015 16:45:37 - 1.5 +++ distinfo 16 Dec 2018 23:58:19 - @@ -1,2 +1,2 @@ -SHA256 (uim-1.8.6.tar.gz) = DuvPWyGS0M0RAYrb1p41i/oGLTtdY8HdC3PV9j63r+c= -SIZE (uim-1.8.6.tar.gz) = 8195769
Re: UPDATE: inputmethods/uim
On Wed, Dec 19, 2018 at 1:02 AM Anthony J. Bentley wrote: > On Mon, Dec 10, 2018 at 1:21 AM Anthony J. Bentley wrote: > > Here is an update to uim-1.8.8. > > > > Release notes: https://github.com/uim/uim/releases > > So, ok for the attached libgcroots port and uim update? Ping. -- Anthony J. Bentley Index: Makefile === RCS file: /cvs/ports/inputmethods/uim/Makefile,v retrieving revision 1.62 diff -u -p -r1.62 Makefile --- Makefile 24 Oct 2018 14:28:06 - 1.62 +++ Makefile 16 Dec 2018 23:58:19 - @@ -11,7 +11,7 @@ COMMENT-qt4= uim for QT4 CATEGORIES= inputmethods japanese chinese -V= 1.8.6 +V= 1.8.8 DISTNAME= uim-$V PKGNAME-main= uim-$V PKGNAME-gtk= uim-gtk-$V @@ -19,14 +19,12 @@ PKGNAME-gtk3= uim-gtk3-$V PKGNAME-kde= uim-kde-$V PKGNAME-qt= uim-qt-$V PKGNAME-qt4= uim-qt4-$V -REVISION= 8 -MASTER_SITES= https://github.com/uim/uim/releases/download/uim-$V/ +MASTER_SITES= https://github.com/uim/uim/releases/download/$V/ HOMEPAGE= https://github.com/uim/uim -SHARED_LIBS += gcroots 0.0 # .1.0 SHARED_LIBS += uim-scm 0.0 # .0.0 -SHARED_LIBS += uim 1.0 # .6.0 +SHARED_LIBS += uim 1.1 # .6.0 SHARED_LIBS += uim-custom 0.0 # .2.0 # BSD @@ -46,11 +44,12 @@ USE_GMAKE= Yes RUN_DEPENDS-main= devel/desktop-file-utils -WANTLIB-main += ${cWANTLIB} -WANTLIB-main += Xft anthy anthydic c curses expat ${COMPILER_LIBCXX} -WANTLIB-main += util xcb z +WANTLIB-main += ${cWANTLIB} ${COMPILER_LIBCXX} +WANTLIB-main += Xft anthy anthydic c curses edit expat gcroots +WANTLIB-main += sqlite3 util xcb z -LIB_DEPENDS-main= inputmethods/anthy +LIB_DEPENDS-main= inputmethods/anthy \ + devel/libgcroots WANTLIB-gtk += ${cWANTLIB} @@ -58,7 +57,7 @@ WANTLIB-gtk += Xcomposite Xcursor Xdamag WANTLIB-gtk += atk-1.0 c cairo expat ffi gcroots gdk-x11-2.0 gdk_pixbuf-2.0 WANTLIB-gtk += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2 WANTLIB-gtk += gthread-2.0 gtk-x11-2.0 harfbuzz pango-1.0 pangocairo-1.0 -WANTLIB-gtk += pangoft2-1.0 pcre pixman-1 png pthread +WANTLIB-gtk += pangoft2-1.0 pcre pixman-1 png pthread fribidi WANTLIB-gtk += uim uim-custom uim-scm xcb xcb-render xcb-shm z LIB_DEPENDS-gtk= inputmethods/uim \ @@ -66,11 +65,11 @@ LIB_DEPENDS-gtk= inputmethods/uim \ WANTLIB-gtk3 += ${cWANTLIB} WANTLIB-gtk3 += Xcomposite Xcursor Xdamage Xfixes Xi Xinerama -WANTLIB-gtk3 += Xrandr Xtst atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject +WANTLIB-gtk3 += Xrandr atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject WANTLIB-gtk3 += dbus-1 expat ffi gcroots gdk-3 gdk_pixbuf-2.0 gio-2.0 WANTLIB-gtk3 += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 WANTLIB-gtk3 += gtk-3 harfbuzz pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB-gtk3 += pcre pixman-1 png pthread uim uim-custom +WANTLIB-gtk3 += pcre pixman-1 png pthread uim uim-custom fribidi WANTLIB-gtk3 += uim-scm xcb xcb-render xcb-shm z epoxy LIB_DEPENDS-gtk3= inputmethods/uim \ @@ -81,6 +80,7 @@ WANTLIB-kde += DCOP GL ICE SM X11-xcb Xc WANTLIB-kde += Xft Xi Xinerama Xmu Xrandr Xt Xxf86vm art_lgpl_2 drm WANTLIB-kde += expat gcroots glapi idn jpeg kdefx lcms mng png pthread WANTLIB-kde += qt-mt ${COMPILER_LIBCXX} uim uim-scm util xcb xcb-dri2 +WANTLIB-kde += xcb-dri3 xcb-present xcb-sync xcb-xfixes xshmfence WANTLIB-kde += xcb-glx z LIB_DEPENDS-kde= inputmethods/uim \ @@ -91,6 +91,7 @@ WANTLIB-qt += GL ICE SM X11-xcb Xcursor WANTLIB-qt += Xft Xi Xinerama Xmu Xrandr Xt Xxf86vm c drm expat gcroots WANTLIB-qt += glapi jpeg lcms mng png pthread ${COMPILER_LIBCXX} WANTLIB-qt += uim uim-custom uim-scm xcb xcb-dri2 xcb-glx z +WANTLIB-qt += xcb-dri3 xcb-present xcb-sync xcb-xfixes xshmfence LIB_DEPENDS-qt= ${MODQT3_LIB_DEPENDS} \ inputmethods/uim @@ -102,7 +103,7 @@ WANTLIB-qt4 += uim-custom uim-scm LIB_DEPENDS-qt4= ${MODQT4_LIB_DEPENDS} \ inputmethods/uim -AUTOCONF_VERSION= 2.68 +AUTOCONF_VERSION= 2.69 CONFIGURE_STYLE= autoconf CONFIGURE_ENV= CPPFLAGS='-I${MODQT3_INCDIR} -I${LOCALBASE}/include -I${X11BASE}/include' \ @@ -114,7 +115,8 @@ CONFIGURE_ARGS= --with-qt \ --with-qt-immodule \ --with-qt4 \ --with-qt4-immodule \ - --with-anthy-utf8 + --with-anthy-utf8 \ + --with-libgcroots post-install: rm ${PREFIX}/lib/uim/plugin/*.{a,la} Index: distinfo === RCS file: /cvs/ports/inputmethods/uim/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo 9 Jan 2015 16:45:37 - 1.5 +++ distinfo 16 Dec 2018 23:58:19 - @@ -1,2 +1,2 @@ -SHA256 (uim-1.8.6.tar.gz) = DuvPWyGS0M0RAYrb1p41i/oGLTtdY8HdC3PV9j63r+c= -SIZE (uim-1.8.6.tar.gz) = 8195769 +SHA256 (uim-1.8.8.tar.gz) = Rrk0Y94nt2s9A5040dl7aKya3aYpaUrv+I2cSxhNVgQ= +SIZE (uim-1.8.8.tar.gz) = 7827966 Index: patches/patch-configure_ac
Re: UPDATE: inputmethods/uim
Hi, On Mon, Dec 10, 2018 at 1:21 AM Anthony J. Bentley wrote: > Here is an update to uim-1.8.8. > > Release notes: https://github.com/uim/uim/releases > > Upstream has split libgcroots into its own package; I've attached a > port for it. What's the right way to mark this in PLIST? As often happens, this was mere confusion on my part--the PLIST is already correct. So, ok for the attached libgcroots port and uim update? -- Anthony J. Bentley libgcroots.tar.gz Description: application/gzip Index: Makefile === RCS file: /cvs/ports/inputmethods/uim/Makefile,v retrieving revision 1.62 diff -u -p -r1.62 Makefile --- Makefile 24 Oct 2018 14:28:06 - 1.62 +++ Makefile 16 Dec 2018 23:58:19 - @@ -11,7 +11,7 @@ COMMENT-qt4= uim for QT4 CATEGORIES= inputmethods japanese chinese -V= 1.8.6 +V= 1.8.8 DISTNAME= uim-$V PKGNAME-main= uim-$V PKGNAME-gtk= uim-gtk-$V @@ -19,14 +19,12 @@ PKGNAME-gtk3= uim-gtk3-$V PKGNAME-kde= uim-kde-$V PKGNAME-qt= uim-qt-$V PKGNAME-qt4= uim-qt4-$V -REVISION= 8 -MASTER_SITES= https://github.com/uim/uim/releases/download/uim-$V/ +MASTER_SITES= https://github.com/uim/uim/releases/download/$V/ HOMEPAGE= https://github.com/uim/uim -SHARED_LIBS += gcroots 0.0 # .1.0 SHARED_LIBS += uim-scm 0.0 # .0.0 -SHARED_LIBS += uim 1.0 # .6.0 +SHARED_LIBS += uim 1.1 # .6.0 SHARED_LIBS += uim-custom 0.0 # .2.0 # BSD @@ -46,11 +44,12 @@ USE_GMAKE= Yes RUN_DEPENDS-main= devel/desktop-file-utils -WANTLIB-main += ${cWANTLIB} -WANTLIB-main += Xft anthy anthydic c curses expat ${COMPILER_LIBCXX} -WANTLIB-main += util xcb z +WANTLIB-main += ${cWANTLIB} ${COMPILER_LIBCXX} +WANTLIB-main += Xft anthy anthydic c curses edit expat gcroots +WANTLIB-main += sqlite3 util xcb z -LIB_DEPENDS-main= inputmethods/anthy +LIB_DEPENDS-main= inputmethods/anthy \ + devel/libgcroots WANTLIB-gtk += ${cWANTLIB} @@ -58,7 +57,7 @@ WANTLIB-gtk += Xcomposite Xcursor Xdamag WANTLIB-gtk += atk-1.0 c cairo expat ffi gcroots gdk-x11-2.0 gdk_pixbuf-2.0 WANTLIB-gtk += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2 WANTLIB-gtk += gthread-2.0 gtk-x11-2.0 harfbuzz pango-1.0 pangocairo-1.0 -WANTLIB-gtk += pangoft2-1.0 pcre pixman-1 png pthread +WANTLIB-gtk += pangoft2-1.0 pcre pixman-1 png pthread fribidi WANTLIB-gtk += uim uim-custom uim-scm xcb xcb-render xcb-shm z LIB_DEPENDS-gtk= inputmethods/uim \ @@ -66,11 +65,11 @@ LIB_DEPENDS-gtk= inputmethods/uim \ WANTLIB-gtk3 += ${cWANTLIB} WANTLIB-gtk3 += Xcomposite Xcursor Xdamage Xfixes Xi Xinerama -WANTLIB-gtk3 += Xrandr Xtst atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject +WANTLIB-gtk3 += Xrandr atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject WANTLIB-gtk3 += dbus-1 expat ffi gcroots gdk-3 gdk_pixbuf-2.0 gio-2.0 WANTLIB-gtk3 += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 WANTLIB-gtk3 += gtk-3 harfbuzz pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB-gtk3 += pcre pixman-1 png pthread uim uim-custom +WANTLIB-gtk3 += pcre pixman-1 png pthread uim uim-custom fribidi WANTLIB-gtk3 += uim-scm xcb xcb-render xcb-shm z epoxy LIB_DEPENDS-gtk3= inputmethods/uim \ @@ -81,6 +80,7 @@ WANTLIB-kde += DCOP GL ICE SM X11-xcb Xc WANTLIB-kde += Xft Xi Xinerama Xmu Xrandr Xt Xxf86vm art_lgpl_2 drm WANTLIB-kde += expat gcroots glapi idn jpeg kdefx lcms mng png pthread WANTLIB-kde += qt-mt ${COMPILER_LIBCXX} uim uim-scm util xcb xcb-dri2 +WANTLIB-kde += xcb-dri3 xcb-present xcb-sync xcb-xfixes xshmfence WANTLIB-kde += xcb-glx z LIB_DEPENDS-kde= inputmethods/uim \ @@ -91,6 +91,7 @@ WANTLIB-qt += GL ICE SM X11-xcb Xcursor WANTLIB-qt += Xft Xi Xinerama Xmu Xrandr Xt Xxf86vm c drm expat gcroots WANTLIB-qt += glapi jpeg lcms mng png pthread ${COMPILER_LIBCXX} WANTLIB-qt += uim uim-custom uim-scm xcb xcb-dri2 xcb-glx z +WANTLIB-qt += xcb-dri3 xcb-present xcb-sync xcb-xfixes xshmfence LIB_DEPENDS-qt= ${MODQT3_LIB_DEPENDS} \ inputmethods/uim @@ -102,7 +103,7 @@ WANTLIB-qt4 += uim-custom uim-scm LIB_DEPENDS-qt4= ${MODQT4_LIB_DEPENDS} \ inputmethods/uim -AUTOCONF_VERSION= 2.68 +AUTOCONF_VERSION= 2.69 CONFIGURE_STYLE= autoconf CONFIGURE_ENV= CPPFLAGS='-I${MODQT3_INCDIR} -I${LOCALBASE}/include -I${X11BASE}/include' \ @@ -114,7 +115,8 @@ CONFIGURE_ARGS= --with-qt \ --with-qt-immodule \ --with-qt4 \ --with-qt4-immodule \ - --with-anthy-utf8 + --with-anthy-utf8 \ + --with-libgcroots post-install: rm ${PREFIX}/lib/uim/plugin/*.{a,la} Index: distinfo === RCS file: /cvs/ports/inputmethods/uim/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo 9 Jan 2015 16:45:37 - 1.5 +++ distinfo 16 Dec 2018 23:58:19 - @@ -1,2 +1,2 @@ -SHA256 (uim-1.8.6.tar.gz) = DuvPWyGS0M0RAYrb1p41i/oGLTtdY8HdC3PV9j63r+c= -SIZE (uim-1.8.6.tar.gz) = 8195769 +SHA256
Re: UPDATE: inputmethods/uim
On 2018-12-16 17:11:28, "Anthony J. Bentley" wrote: > Bryan Linton writes: > > I removed those lines and got farther, but the build still fails for me. > > Build logs attached below. If I've done something wrong, feel free to > > hit me with a cluebat. > > As far as I can tell there's no actual error in the logs you attached. > I can't reproduce; for me everything builds fine even on a fresh > -current vmm(4) VM. > Whoops, it looks like I cut and pasted the log from the wrong area. I think the actual error is: gmake[5]: Entering directory '/usr/obj/ports/uim-1.8.8/uim-1.8.8/qt4/toolbar/build' gmake[5]: *** No rule to make target '../../../uim/.libs/libuim.so', needed by 'lib/plasma_applet_uim.so'. Stop. > It would be helpful if you could test removing packages one by one until > you find the one that's breaking your build. > % pkg_info -a | wc -l 1035 That's going to take a long time... more time than I have currently. But if you can't reproduce this and it works fine for you, it may be better to just go ahead and commit it since it clearly seems to be a problem on my end. -- Bryan
Re: UPDATE: inputmethods/uim
Bryan Linton writes: > The first thing I noticed was that the qt4 MULTI_PACKAGE wouldn't > continue building until I manually installed devel/automoc, so it > probably needs adding to the Makefile as either a BUILD or LIB_DEPEND. Can't reproduce here: uim-qt4 builds without automoc of any kind installed. > Considering that all the build failures end with the same error, which is: > > gmake[1]: Entering directory '/usr/obj/ports/uim-1.8.8/uim-1.8.8/scm' > if test -n "/usr/local/bin/csi"; then \ > /usr/local/bin/csi -R syntax-case -q json-parser-expander.scm > jso > n-p= > arser-expanded.scm; \ > fi > error CS2006: Command-line syntax error: Missing '' for '-R' opti > on > error CS2001: Source file '/usr/obj/ports/uim-1.8.8/uim-1.8.8/scm/synta > x-c= > ase' could not be found. It's looking for chicken. But if I patch it to use chicken, there seem to be chicken language errors of some sort, yet the file manages to get installed anyway. Since FreeBSD patches it out, I've done it too; new diff below. Thanks for pointing that out. > I removed those lines and got farther, but the build still fails for me. > Build logs attached below. If I've done something wrong, feel free to > hit me with a cluebat. As far as I can tell there's no actual error in the logs you attached. I can't reproduce; for me everything builds fine even on a fresh -current vmm(4) VM. It would be helpful if you could test removing packages one by one until you find the one that's breaking your build. > Also, as a side note, would it be possible to add a qt5 MULTI_PACKAGE > as well? I'm fine with that, but I'd like to get this update in first. Here's the updated diff that builds even when mono is installed: Index: Makefile === RCS file: /cvs/ports/inputmethods/uim/Makefile,v retrieving revision 1.62 diff -u -p -r1.62 Makefile --- Makefile24 Oct 2018 14:28:06 - 1.62 +++ Makefile16 Dec 2018 23:58:19 - @@ -11,7 +11,7 @@ COMMENT-qt4= uim for QT4 CATEGORIES=inputmethods japanese chinese -V= 1.8.6 +V= 1.8.8 DISTNAME= uim-$V PKGNAME-main= uim-$V PKGNAME-gtk= uim-gtk-$V @@ -19,14 +19,12 @@ PKGNAME-gtk3= uim-gtk3-$V PKGNAME-kde= uim-kde-$V PKGNAME-qt=uim-qt-$V PKGNAME-qt4= uim-qt4-$V -REVISION= 8 -MASTER_SITES= https://github.com/uim/uim/releases/download/uim-$V/ +MASTER_SITES= https://github.com/uim/uim/releases/download/$V/ HOMEPAGE= https://github.com/uim/uim -SHARED_LIBS += gcroots 0.0 # .1.0 SHARED_LIBS += uim-scm 0.0 # .0.0 -SHARED_LIBS += uim 1.0 # .6.0 +SHARED_LIBS += uim 1.1 # .6.0 SHARED_LIBS += uim-custom 0.0 # .2.0 # BSD @@ -46,11 +44,12 @@ USE_GMAKE= Yes RUN_DEPENDS-main= devel/desktop-file-utils -WANTLIB-main += ${cWANTLIB} -WANTLIB-main += Xft anthy anthydic c curses expat ${COMPILER_LIBCXX} -WANTLIB-main += util xcb z +WANTLIB-main += ${cWANTLIB} ${COMPILER_LIBCXX} +WANTLIB-main += Xft anthy anthydic c curses edit expat gcroots +WANTLIB-main += sqlite3 util xcb z -LIB_DEPENDS-main= inputmethods/anthy +LIB_DEPENDS-main= inputmethods/anthy \ + devel/libgcroots WANTLIB-gtk += ${cWANTLIB} @@ -58,7 +57,7 @@ WANTLIB-gtk += Xcomposite Xcursor Xdamag WANTLIB-gtk += atk-1.0 c cairo expat ffi gcroots gdk-x11-2.0 gdk_pixbuf-2.0 WANTLIB-gtk += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2 WANTLIB-gtk += gthread-2.0 gtk-x11-2.0 harfbuzz pango-1.0 pangocairo-1.0 -WANTLIB-gtk += pangoft2-1.0 pcre pixman-1 png pthread +WANTLIB-gtk += pangoft2-1.0 pcre pixman-1 png pthread fribidi WANTLIB-gtk += uim uim-custom uim-scm xcb xcb-render xcb-shm z LIB_DEPENDS-gtk= inputmethods/uim \ @@ -66,11 +65,11 @@ LIB_DEPENDS-gtk=inputmethods/uim \ WANTLIB-gtk3 += ${cWANTLIB} WANTLIB-gtk3 += Xcomposite Xcursor Xdamage Xfixes Xi Xinerama -WANTLIB-gtk3 += Xrandr Xtst atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject +WANTLIB-gtk3 += Xrandr atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject WANTLIB-gtk3 += dbus-1 expat ffi gcroots gdk-3 gdk_pixbuf-2.0 gio-2.0 WANTLIB-gtk3 += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 WANTLIB-gtk3 += gtk-3 harfbuzz pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB-gtk3 += pcre pixman-1 png pthread uim uim-custom +WANTLIB-gtk3 += pcre pixman-1 png pthread uim uim-custom fribidi WANTLIB-gtk3 += uim-scm xcb xcb-render xcb-shm z epoxy LIB_DEPENDS-gtk3= inputmethods/uim \ @@ -81,6 +80,7 @@ WANTLIB-kde += DCOP GL ICE SM X11-xcb Xc WANTLIB-kde += Xft Xi Xinerama Xmu Xrandr Xt Xxf86vm art_lgpl_2 drm WANTLIB-kde += expat gcroots glapi idn jpeg kdefx lcms mng png pthread WANTLIB-kde += qt-mt ${COMPILER_LIBCXX} uim
Re: UPDATE: inputmethods/uim
On 2018-12-10 01:21:49, "Anthony J. Bentley" wrote: > Hi, >=20 > Here is an update to uim-1.8.8. >=20 > Release notes: https://github.com/uim/uim/releases >=20 First, thank you for sending an update to uim! I use it daily and I'm happy to see that it's getting an update given that 1.8.6 was released all the way back in 2013. Unfortunately, I had a few problems getting it to build. The first thing I noticed was that the qt4 MULTI_PACKAGE wouldn't continue building until I manually installed devel/automoc, so it=20 probably needs adding to the Makefile as either a BUILD or LIB_DEPEND. But even after doing so, I still get build failures with both the base version as well as the MULTI_PACKAGES.=20 Considering that all the build failures end with the same error, which is: gmake[1]: Entering directory '/usr/obj/ports/uim-1.8.8/uim-1.8.8/scm' if test -n "/usr/local/bin/csi"; then \ /usr/local/bin/csi -R syntax-case -q json-parser-expander.scm > json-p= arser-expanded.scm; \ fi error CS2006: Command-line syntax error: Missing '' for '-R' option error CS2001: Source file '/usr/obj/ports/uim-1.8.8/uim-1.8.8/scm/syntax-c= ase' could not be found. It looks like it's related to this:=20 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D229674 Summary: textproc/uim: does not build when mono is installed For reference: % csi Microsoft (R) Visual C# Interactive Compiler version 2.7.0.62620 Copyright (C) Microsoft Corporation. All rights reserved. =09 Type "#help" for more information. >=20 It looks like FreeBSD simply deleted the offending lines from the Makefile: https://svnweb.freebsd.org/ports?view=3Drevision=3D474523 https://svnweb.freebsd.org/ports/head/textproc/uim/files/patch-scm_Makefil= e.in?view=3Dmarkup=3D474523 I removed those lines and got farther, but the build still fails for me. Build logs attached below. If I've done something wrong, feel free to hit me with a cluebat. Also, as a side note, would it be possible to add a qt5 MULTI_PACKAGE as well? I don't use many qt applications, but I remember that gtk3 applications didn't work without the gtk3 subpackage many years ago. Or, they sort of did if you added an environment hack, but they were very buggy. I remember I pestered^W asked a developer nicely to add the gtk3 MULTI_PACKAGE and everything's been working fine since then. I'm not sure if qt{3,4,5} are as picky about things as gtk{2,3} are, so it may not be necessary, but probably wouldn't hurt to have. Anyway, thanks again for sending the patch! -8<- % sysctl kern.version kern.version=3DOpenBSD 6.4-current (GENERIC.MP) #494: Sat Dec 8 16:58:39 M= ST 2018 dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP % pkg_info | grep libgcroots libgcroots-0.3.1garbage collector library % make package [...] /usr/obj/ports/uim-1.8.8/bin/c++ -DKDE4_CMAKE_TOPLEVEL_DIR_LENGTH=3D38 -DK= DE_DEPRECATED_WARNINGS -DMAKE_PLASMA_APPLET_UIM_LIB -DPLASMA_APPLET_UIM -DQ= T_CORE_LIB -DQT_DBUS_LIB -DQT_GUI_LIB -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -= DQT_NO_STL -DQT_SVG_LIB -D_REENTRANT -I/usr/obj/ports/uim-1.8.8/uim-1.8.8/q= t4/toolbar/build -I/usr/obj/ports/uim-1.8.8/uim-1.8.8/qt4/toolbar -I/usr/ob= j/ports/uim-1.8.8/uim-1.8.8/qt4/toolbar/../.. -I/usr/obj/ports/uim-1.8.8/ui= m-1.8.8/qt4/toolbar/../../uim -I/usr/obj/ports/uim-1.8.8/uim-1.8.8/qt4/tool= bar/../../replace -I/usr/obj/ports/uim-1.8.8/uim-1.8.8/qt4/toolbar/.. -I/us= r/obj/ports/uim-1.8.8/uim-1.8.8/qt4/toolbar/build/../../../uim -I/usr/local= /include/kde4 -I/usr/local/include/kde4/KDE -I/usr/local/include/X11/qt4/Qt= Designer -I/usr/local/include/X11/qt4/QtDeclarative -I/usr/local/include/X1= 1/qt4/QtScriptTools -isystem /usr/local/include/X11/qt4/QtDBus -I/usr/local= /include/X11/qt4/QtXml -I/usr/local/include/X11/qt4/QtSql -I/usr/local/incl= ude/X11/qt4/QtOpenGL -I/usr/local/include/X11/qt4/QtMultimedia -I/usr/local= /include/X11/qt4/QtNetwork -I/usr/local/include/X11/qt4/phonon -I/usr/local= /include/X11/qt4/QtXmlPatterns -I/usr/local/include/X11/qt4/QtWebKit -I/usr= /local/include/X11/qt4/QtHelp -I/usr/local/include/X11/qt4/QtUiTools -I/usr= /local/include/X11/qt4/QtTest -I/usr/local/include/X11/qt4/QtScript -isyste= m /usr/local/include/X11/qt4/QtSvg -I/usr/local/include/X11/qt4/Qt3Support = -isystem /usr/local/include/X11/qt4/QtGui -isystem /usr/local/include/X11/q= t4/QtCore -isystem /usr/local/lib/qt4/mkspecs/default -isystem /usr/local/i= nclude/X11/qt4 -I/usr/X11R6/include -O2 -pipe -W -Wall -Wchar-subscripts -= Wnon-virtual-dtor -Wno-long-long -Wcast-align -Wpointer-arith -Wwrite-stri= ngs -Wformat-security -DNDEBUG -I/usr/X11R6/include -Wnon-virtual-dtor -Wn= o-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith= -Wformat-security -Woverloaded-virtual -fno-common -fvisibility=3Dhidden -= Werror=3Dreturn-type -fvisibility-inlines-hidden
UPDATE: inputmethods/uim
Hi, Here is an update to uim-1.8.8. Release notes: https://github.com/uim/uim/releases Upstream has split libgcroots into its own package; I've attached a port for it. What's the right way to mark this in PLIST? I thought a "@conflict uim-<1.8.8" in libgcroots would be enough, but that breaks the upgrade path: ===> Installing uim-1.8.8 from /packages/amd64/all/ Can't install libgcroots-0.3.1 because of conflicts (uim-1.8.6p8) Can't install uim-1.8.6p8->1.8.8: can't resolve libgcroots-0.3.1 -- Anthony J. Bentley libgcroots.tar.gz Description: libgcroots.tar.gz Index: Makefile === RCS file: /cvs/ports/inputmethods/uim/Makefile,v retrieving revision 1.62 diff -u -p -r1.62 Makefile --- Makefile 24 Oct 2018 14:28:06 - 1.62 +++ Makefile 10 Dec 2018 08:16:35 - @@ -11,7 +11,7 @@ COMMENT-qt4= uim for QT4 CATEGORIES= inputmethods japanese chinese -V= 1.8.6 +V= 1.8.8 DISTNAME= uim-$V PKGNAME-main= uim-$V PKGNAME-gtk= uim-gtk-$V @@ -19,14 +19,12 @@ PKGNAME-gtk3= uim-gtk3-$V PKGNAME-kde= uim-kde-$V PKGNAME-qt= uim-qt-$V PKGNAME-qt4= uim-qt4-$V -REVISION= 8 -MASTER_SITES= https://github.com/uim/uim/releases/download/uim-$V/ +MASTER_SITES= https://github.com/uim/uim/releases/download/$V/ HOMEPAGE= https://github.com/uim/uim -SHARED_LIBS += gcroots 0.0 # .1.0 SHARED_LIBS += uim-scm 0.0 # .0.0 -SHARED_LIBS += uim 1.0 # .6.0 +SHARED_LIBS += uim 1.1 # .6.0 SHARED_LIBS += uim-custom 0.0 # .2.0 # BSD @@ -46,11 +44,12 @@ USE_GMAKE= Yes RUN_DEPENDS-main= devel/desktop-file-utils -WANTLIB-main += ${cWANTLIB} -WANTLIB-main += Xft anthy anthydic c curses expat ${COMPILER_LIBCXX} -WANTLIB-main += util xcb z +WANTLIB-main += ${cWANTLIB} ${COMPILER_LIBCXX} +WANTLIB-main += Xft anthy anthydic c curses edit expat gcroots +WANTLIB-main += sqlite3 util xcb z -LIB_DEPENDS-main= inputmethods/anthy +LIB_DEPENDS-main= inputmethods/anthy \ + devel/libgcroots WANTLIB-gtk += ${cWANTLIB} @@ -58,7 +57,7 @@ WANTLIB-gtk += Xcomposite Xcursor Xdamag WANTLIB-gtk += atk-1.0 c cairo expat ffi gcroots gdk-x11-2.0 gdk_pixbuf-2.0 WANTLIB-gtk += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2 WANTLIB-gtk += gthread-2.0 gtk-x11-2.0 harfbuzz pango-1.0 pangocairo-1.0 -WANTLIB-gtk += pangoft2-1.0 pcre pixman-1 png pthread +WANTLIB-gtk += pangoft2-1.0 pcre pixman-1 png pthread fribidi WANTLIB-gtk += uim uim-custom uim-scm xcb xcb-render xcb-shm z LIB_DEPENDS-gtk= inputmethods/uim \ @@ -66,11 +65,11 @@ LIB_DEPENDS-gtk= inputmethods/uim \ WANTLIB-gtk3 += ${cWANTLIB} WANTLIB-gtk3 += Xcomposite Xcursor Xdamage Xfixes Xi Xinerama -WANTLIB-gtk3 += Xrandr Xtst atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject +WANTLIB-gtk3 += Xrandr atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject WANTLIB-gtk3 += dbus-1 expat ffi gcroots gdk-3 gdk_pixbuf-2.0 gio-2.0 WANTLIB-gtk3 += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 WANTLIB-gtk3 += gtk-3 harfbuzz pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB-gtk3 += pcre pixman-1 png pthread uim uim-custom +WANTLIB-gtk3 += pcre pixman-1 png pthread uim uim-custom fribidi WANTLIB-gtk3 += uim-scm xcb xcb-render xcb-shm z epoxy LIB_DEPENDS-gtk3= inputmethods/uim \ @@ -81,6 +80,7 @@ WANTLIB-kde += DCOP GL ICE SM X11-xcb Xc WANTLIB-kde += Xft Xi Xinerama Xmu Xrandr Xt Xxf86vm art_lgpl_2 drm WANTLIB-kde += expat gcroots glapi idn jpeg kdefx lcms mng png pthread WANTLIB-kde += qt-mt ${COMPILER_LIBCXX} uim uim-scm util xcb xcb-dri2 +WANTLIB-kde += xcb-dri3 xcb-present xcb-sync xcb-xfixes xshmfence WANTLIB-kde += xcb-glx z LIB_DEPENDS-kde= inputmethods/uim \ @@ -91,6 +91,7 @@ WANTLIB-qt += GL ICE SM X11-xcb Xcursor WANTLIB-qt += Xft Xi Xinerama Xmu Xrandr Xt Xxf86vm c drm expat gcroots WANTLIB-qt += glapi jpeg lcms mng png pthread ${COMPILER_LIBCXX} WANTLIB-qt += uim uim-custom uim-scm xcb xcb-dri2 xcb-glx z +WANTLIB-qt += xcb-dri3 xcb-present xcb-sync xcb-xfixes xshmfence LIB_DEPENDS-qt= ${MODQT3_LIB_DEPENDS} \ inputmethods/uim @@ -102,7 +103,7 @@ WANTLIB-qt4 += uim-custom uim-scm LIB_DEPENDS-qt4= ${MODQT4_LIB_DEPENDS} \ inputmethods/uim -AUTOCONF_VERSION= 2.68 +AUTOCONF_VERSION= 2.69 CONFIGURE_STYLE= autoconf CONFIGURE_ENV= CPPFLAGS='-I${MODQT3_INCDIR} -I${LOCALBASE}/include -I${X11BASE}/include' \ @@ -114,7 +115,8 @@ CONFIGURE_ARGS= --with-qt \ --with-qt-immodule \ --with-qt4 \ --with-qt4-immodule \ - --with-anthy-utf8 + --with-anthy-utf8 \ + --with-libgcroots post-install: rm ${PREFIX}/lib/uim/plugin/*.{a,la} Index: distinfo === RCS file: /cvs/ports/inputmethods/uim/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo 9 Jan 2015 16:45:37 - 1.5 +++ distinfo 10 Dec 2018 08:16:35 - @@ -1,2 +1,2 @@ -SHA256 (uim-1.8.6.tar.gz) =