CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2012/11/13 01:09:53 Modified files: devel/gobject-introspection: Makefile distinfo Log message: - update to gobject-introspection-1.34.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2012/11/13 01:12:21 Modified files: devel/libwnck3 : Makefile distinfo devel/libwnck3/pkg: PLIST Log message: - update to libwnck-3.4.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2012/11/13 01:17:45 Modified files: x11/gnome/font-viewer: Makefile distinfo x11/gnome/font-viewer/patches: patch-configure x11/gnome/font-viewer/pkg: PLIST Log message: - update to gnome-font-viewer-3.6.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2012/11/13 01:18:22 Modified files: x11/gnome/system-log: Makefile distinfo x11/gnome/system-log/pkg: PLIST Log message: - update to gnome-system-log-3.6.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2012/11/13 01:20:44 Modified files: x11/gnome/screenshot: Makefile distinfo Log message: - update to gnome-screenshot-3.6.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2012/11/13 01:24:52 Modified files: x11/gnome/gucharmap: Makefile distinfo Log message: - update to gucharmap-3.6.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2012/11/13 01:24:52 Modified files: devel/vte3 : Makefile distinfo devel/vte3/pkg : PLIST Log message: - update to vte-0.34.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2012/11/13 01:26:25 Modified files: security/nss/patches: patch-mozilla_security_nss_lib_ckfw_builtins_certdata_c Log message: Remove the chunks only containing #@!#@!$@! rcs ids changes, patch was not applying properly because of them. Reported by ajacoutot@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2012/11/13 01:41:02 Modified files: x11/gnome/gedit: Makefile distinfo x11/gnome/gedit/patches: patch-configure Log message: - update to gedit-3.6.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2012/11/13 01:40:55 Modified files: x11/gnome/eog : Makefile distinfo Removed files: x11/gnome/eog/patches: patch-src_Makefile_in Log message: - update to eog-3.6.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2012/11/13 01:41:51 Modified files: x11/gnome/file-roller: Makefile distinfo Log message: - update to file-roller-3.6.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dco...@cvs.openbsd.org 2012/11/13 01:44:02 Modified files: x11/i3 : Makefile x11/i3/patches : patch-include_data_h patch-src_floating_c patch-src_manage_c patch-src_workspace_c patch-src_x_c Log message: Bugfix: fix workspace back_and_forth after displaying a scratchpad window (upstream git commit 81393c93c2810e098966fe4089f3c8ea09f9cbe6)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2012/11/13 01:44:59 Modified files: x11/gnome/gcalctool: Makefile distinfo x11/gnome/gcalctool/pkg: PLIST Log message: - update to gcalctool-6.6.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2012/11/13 03:07:20 Modified files: x11/gnome/mutter: Makefile distinfo Log message: - update to mutter-3.6.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2012/11/13 03:17:35 Modified files: x11/gnome/rygel: Makefile distinfo Log message: - update to rygel-0.16.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2012/11/13 03:35:34 Modified files: x11/gnome/anjuta: Makefile distinfo Removed files: x11/gnome/anjuta/patches: patch-src_action-callbacks_c patch-src_anjuta-app_c Log message: - update to anjuta-3.6.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2012/11/13 03:42:27 Removed files: lang/sbcl/patches: patch-src_runtime_Config_x86-openbsd devel/libusb-compat/patches: patch-libusb-config_in devel/libusb1/patches: patch-libusb-1_0_pc_in Log message: remove empty files
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2012/11/13 03:42:41 Modified files: net/telepathy : Makefile Log message: unhook telepathy-python
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2012/11/13 03:43:28 Removed files: net/telepathy/telepathy-python: Makefile distinfo net/telepathy/telepathy-python/pkg: DESCR PLIST Log message: remove telepathy-python, it's been deprecated in favor of the gobject-introspection bindings in telepathy-glib. ok aja@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2012/11/13 03:54:02 Modified files: net/telepathy/telepathy-gabble: Makefile distinfo net/telepathy/telepathy-gabble/pkg: PLIST Log message: - update to telepathy-gabbler-0.16.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2012/11/13 04:11:03 Modified files: devel/gsettings-desktop-schemas: Makefile distinfo devel/gsettings-desktop-schemas/pkg: PLIST Log message: Update to gsettings-desktop-schemas-3.6.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2012/11/13 04:27:23 Modified files: net/telepathy/telepathy-glib: Makefile distinfo net/telepathy/telepathy-glib/patches: patch-telepathy-glib_Makefile_in Log message: - update to telepathy-glib-0.20.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: giova...@cvs.openbsd.org2012/11/13 07:08:04 Modified files: www/piwik : Makefile distinfo www/piwik/pkg : PLIST Log message: Bugfix update to 1.9.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: giova...@cvs.openbsd.org2012/11/13 07:11:33 Modified files: x11/gnome/gedit: Makefile Log message: Add icon-theme-symbolic as a run dependency, not all icons needed are present in default theme. ok ajacoutot@ and jasper@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org 2012/11/13 09:11:17
Modified files:
graphics/hugin : Makefile
Log message:
LDFLAGS += -L${X11BASE}/lib is useless.
OK sthen@ (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2012/11/13 09:16:28 Modified files: x11/gnome/rygel: Makefile distinfo Log message: - update to rygel-0.16.3 ok lajoie@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2012/11/13 09:31:40
Modified files:
emulators/spim : Makefile
Log message:
Fix build if imake isn't installed.
While here, update license and respect ${CC}.
ok kevlo@ (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2012/11/13 09:34:59 Modified files: devel/glib2: Makefile distinfo devel/glib2/patches: patch-gio_tests_file_c Log message: New revision of the kqueue patch; hopefully to be pushed upstream soon...
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2012/11/13 10:23:01 Modified files: x11/gnome/libgweather: Makefile distinfo Log message: - update to libgwheater-3.6.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2012/11/13 10:33:40 Modified files: x11/gnome/online-accounts: Makefile distinfo x11/gnome/online-accounts/pkg: PLIST Log message: - update to gnome-online-accounts-3.6.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2012/11/13 11:19:13 Modified files: x11/gnome/shell: Makefile distinfo x11/gnome/shell/patches: patch-configure_ac Log message: - update to gnome-shell-3.6.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2012/11/13 11:24:34 Modified files: x11/gnome/empathy: Makefile distinfo x11/gnome/empathy/pkg: PLIST Log message: - update to empathy-3.6.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ni...@cvs.openbsd.org 2012/11/13 15:34:04 Modified files: lang/g77 : Makefile distinfo Log message: Add runtime and regress dependencies, fix being able to run regression tests. As per sthen@ comments mip64el left out, and NOT-ARCH left. Ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2012/11/13 23:59:42 Modified files: devel/libgsf : Makefile distinfo devel/libgsf/pkg: PLIST Log message: Update to libgsf-1.14.25.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2012/11/14 00:04:07 Modified files: x11/gnome/menus: Makefile distinfo Log message: Update to gnome-menus-3.6.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2012/11/14 00:04:27 Modified files: x11/gnome/icon-theme: Makefile distinfo Log message: Update to gnome-icon-theme-3.6.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2012/11/14 00:06:57 Modified files: x11/gnome/icon-theme-symbolic: Makefile distinfo x11/gnome/icon-theme-symbolic/pkg: PLIST Log message: Update to gnome-icon-theme-symbolic-3.6.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2012/11/14 00:07:54 Modified files: x11/gnome/icon-theme-extras: Makefile distinfo Log message: Update to gnome-icon-theme-extras-3.6.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2012/11/14 00:08:20 Modified files: x11/gnome/devhelp: Makefile distinfo x11/gnome/devhelp/patches: patch-configure Log message: Update to devhelp-3.6.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2012/11/14 00:33:42 Modified files: devel/pango: Makefile distinfo Log message: Bugfix update to pango-1.32.2.
UPDATE: net/filezilla
Update to latest version (3.6.0), many bugfixes and improvements (On
http://filezilla-project.org/ there are most details).
Comments ? Ok ?
Cheers
Giovanni
? patches/patch-src_engine_Makefile_in
Index: Makefile
===
RCS file: /cvs/ports/net/filezilla/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile23 Apr 2012 17:15:18 - 1.25
+++ Makefile13 Nov 2012 11:26:02 -
@@ -2,11 +2,10 @@
COMMENT= fast FTP and SFTP GUI client with a lot of features
-V= 3.5.3
+V= 3.6.0
PKGNAME= filezilla-$V
DISTNAME= FileZilla_$V_src
EXTRACT_SUFX= .tar.bz2
-REVISION = 0
MAINTAINER=Giovanni Bechis giova...@openbsd.org
@@ -31,9 +30,11 @@ WANTLIB += png pthread-stubs xcb xcb-ren
WANTLIB += idn gnutls=13 dbus-1 wx_gtk2_aui wx_base_xml wx_gtk2_adv
WANTLIB += wx_gtk2_xrc wx_base_net wx_base wx_gtk2_core
WANTLIB += GL sqlite3 ffi p11-kit
+WANTLIB += harfbuzz icudata icule icuuc
MODULES= devel/gettext
LIB_DEPENDS= devel/libidn \
+ devel/harfbuzz \
security/gnutls \
x11/dbus \
x11/wxWidgets=2.8.6
@@ -47,7 +48,7 @@ SEPARATE_BUILD= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=--with-dbus \
--with-tinyxml=builtin \
- --disable-autoupdatecheck
+ --disable-manualupdatecheck
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib \
GREP=/usr/bin/grep \
Index: distinfo
===
RCS file: /cvs/ports/net/filezilla/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo19 Jan 2012 15:41:13 - 1.10
+++ distinfo13 Nov 2012 11:26:02 -
@@ -1,5 +1,2 @@
-MD5 (FileZilla_3.5.3_src.tar.bz2) = oaKEjbDFyPMyHr5O44QuMQ==
-RMD160 (FileZilla_3.5.3_src.tar.bz2) = ptR3fd8xYkIQbWaCDKswLj4So48=
-SHA1 (FileZilla_3.5.3_src.tar.bz2) = Q0lJXNK/i5woUr2mos/MxaBitSo=
-SHA256 (FileZilla_3.5.3_src.tar.bz2) =
C7onuqIEH9km+XdeNg5wrzkc3sEPPzsajf8gs+EA/2s=
-SIZE (FileZilla_3.5.3_src.tar.bz2) = 332
+SHA256 (FileZilla_3.6.0_src.tar.bz2) =
eIVQKKgw+YOe4OC7Z4znw+Vq7x97dDWsEhoCI0yurq4=
+SIZE (FileZilla_3.6.0_src.tar.bz2) = 3525207
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/net/filezilla/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 2 Jan 2011 23:34:16 - 1.4
+++ patches/patch-Makefile_in 13 Nov 2012 11:26:02 -
@@ -1,6 +1,6 @@
Makefile.in.orig Fri Dec 31 11:10:28 2010
-+++ Makefile.inFri Dec 31 11:12:34 2010
-@@ -250,7 +250,7 @@ AUTOMAKE_OPTIONS = 1.6
+--- Makefile.in.orig Sat Nov 10 20:48:33 2012
Makefile.inMon Nov 12 12:24:03 2012
+@@ -307,7 +307,7 @@ AUTOMAKE_OPTIONS = 1.6
SUBDIRS = . $(MAYBE_SRCDIR) $(MAYBE_LOCALES) $(MAYBE_DATADIR) $(MAYBE_TESTS)
dist_noinst_SCRIPTS = autogen.sh
dist_noinst_DATA = filezilla.kdevelop GPL.html docs/iconspecs.htm
Index: patches/patch-tests_Makefile_in
===
RCS file: patches/patch-tests_Makefile_in
diff -N patches/patch-tests_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-tests_Makefile_in 13 Nov 2012 11:26:02 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- tests/Makefile.in.orig Mon Nov 12 13:04:07 2012
tests/Makefile.in Mon Nov 12 13:04:37 2012
+@@ -249,7 +249,7 @@ test_SOURCES = test.cpp \
+ test_CPPFLAGS = $(WX_CPPFLAGS)
+ test_CXXFLAGS = $(WX_CXXFLAGS_ONLY) $(CPPUNIT_CFLAGS)
+ test_LDFLAGS = $(CPPUNIT_LIBS) ../src/engine/libengine.a \
+- $(LIBGNUTLS_LIBS) $(WX_LIBS) $(IDN_LIB)
++ $(LIBGNUTLS_LIBS) $(WX_LIBS) $(IDN_LIB) $(LIBSQLITE3_LIBS)
+ test_DEPENDENCIES = ../src/engine/libengine.a
+ all: all-am
+
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/filezilla/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 31 Mar 2011 12:38:42 - 1.8
+++ pkg/PLIST 13 Nov 2012 11:26:02 -
@@ -196,7 +196,7 @@ share/filezilla/resources/lone/16x16/
share/filezilla/resources/lone/16x16/ascii.png
share/filezilla/resources/lone/16x16/auto.png
share/filezilla/resources/lone/16x16/binary.png
-share/filezilla/resources/lone/16x16/bookmarks.png
+share/filezilla/resources/lone/16x16/bookmark.png
share/filezilla/resources/lone/16x16/cancel.png
share/filezilla/resources/lone/16x16/compare.png
share/filezilla/resources/lone/16x16/disconnect.png
@@ -228,7 +228,7 @@ share/filezilla/resources/lone/32x32/
share/filezilla/resources/lone/32x32/ascii.png
share/filezilla/resources/lone/32x32/auto.png
share/filezilla/resources/lone/32x32/binary.png
-share/filezilla/resources/lone/32x32/bookmarks.png
Re: UPDATE: net/filezilla
On 11/13/12 12:31, Giovanni Bechis wrote:
Update to latest version (3.6.0), many bugfixes and improvements (On
http://filezilla-project.org/ there are most details).
Comments ? Ok ?
Cheers
Giovanni
I forgot to cvs add a patch to fix regression tests.
Cheers
Giovanni
Index: Makefile
===
RCS file: /cvs/ports/net/filezilla/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile23 Apr 2012 17:15:18 - 1.25
+++ Makefile13 Nov 2012 11:33:59 -
@@ -2,11 +2,10 @@
COMMENT= fast FTP and SFTP GUI client with a lot of features
-V= 3.5.3
+V= 3.6.0
PKGNAME= filezilla-$V
DISTNAME= FileZilla_$V_src
EXTRACT_SUFX= .tar.bz2
-REVISION = 0
MAINTAINER=Giovanni Bechis giova...@openbsd.org
@@ -31,9 +30,11 @@ WANTLIB += png pthread-stubs xcb xcb-ren
WANTLIB += idn gnutls=13 dbus-1 wx_gtk2_aui wx_base_xml wx_gtk2_adv
WANTLIB += wx_gtk2_xrc wx_base_net wx_base wx_gtk2_core
WANTLIB += GL sqlite3 ffi p11-kit
+WANTLIB += harfbuzz icudata icule icuuc
MODULES= devel/gettext
LIB_DEPENDS= devel/libidn \
+ devel/harfbuzz \
security/gnutls \
x11/dbus \
x11/wxWidgets=2.8.6
@@ -47,7 +48,7 @@ SEPARATE_BUILD= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=--with-dbus \
--with-tinyxml=builtin \
- --disable-autoupdatecheck
+ --disable-manualupdatecheck
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib \
GREP=/usr/bin/grep \
Index: distinfo
===
RCS file: /cvs/ports/net/filezilla/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo19 Jan 2012 15:41:13 - 1.10
+++ distinfo13 Nov 2012 11:33:59 -
@@ -1,5 +1,2 @@
-MD5 (FileZilla_3.5.3_src.tar.bz2) = oaKEjbDFyPMyHr5O44QuMQ==
-RMD160 (FileZilla_3.5.3_src.tar.bz2) = ptR3fd8xYkIQbWaCDKswLj4So48=
-SHA1 (FileZilla_3.5.3_src.tar.bz2) = Q0lJXNK/i5woUr2mos/MxaBitSo=
-SHA256 (FileZilla_3.5.3_src.tar.bz2) =
C7onuqIEH9km+XdeNg5wrzkc3sEPPzsajf8gs+EA/2s=
-SIZE (FileZilla_3.5.3_src.tar.bz2) = 332
+SHA256 (FileZilla_3.6.0_src.tar.bz2) =
eIVQKKgw+YOe4OC7Z4znw+Vq7x97dDWsEhoCI0yurq4=
+SIZE (FileZilla_3.6.0_src.tar.bz2) = 3525207
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/net/filezilla/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 2 Jan 2011 23:34:16 - 1.4
+++ patches/patch-Makefile_in 13 Nov 2012 11:33:59 -
@@ -1,6 +1,6 @@
Makefile.in.orig Fri Dec 31 11:10:28 2010
-+++ Makefile.inFri Dec 31 11:12:34 2010
-@@ -250,7 +250,7 @@ AUTOMAKE_OPTIONS = 1.6
+--- Makefile.in.orig Sat Nov 10 20:48:33 2012
Makefile.inMon Nov 12 12:24:03 2012
+@@ -307,7 +307,7 @@ AUTOMAKE_OPTIONS = 1.6
SUBDIRS = . $(MAYBE_SRCDIR) $(MAYBE_LOCALES) $(MAYBE_DATADIR) $(MAYBE_TESTS)
dist_noinst_SCRIPTS = autogen.sh
dist_noinst_DATA = filezilla.kdevelop GPL.html docs/iconspecs.htm
Index: patches/patch-src_engine_Makefile_in
===
RCS file: patches/patch-src_engine_Makefile_in
diff -N patches/patch-src_engine_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_engine_Makefile_in13 Nov 2012 11:33:59 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/engine/Makefile.in.origSat Nov 10 20:48:31 2012
src/engine/Makefile.in Mon Nov 12 12:45:21 2012
+@@ -58,7 +58,7 @@ CONFIG_CLEAN_VPATH_FILES =
+ LIBRARIES = $(noinst_LIBRARIES)
+ ARFLAGS = cru
+ libengine_a_AR = $(AR) $(ARFLAGS)
+-libengine_a_LIBADD =
++libengine_a_LIBADD = @LIBSQLITE3_LIBS@
+ am_libengine_a_OBJECTS = libengine_a-backend.$(OBJEXT) \
+ libengine_a-commands.$(OBJEXT) \
+ libengine_a-ControlSocket.$(OBJEXT) \
Index: patches/patch-tests_Makefile_in
===
RCS file: patches/patch-tests_Makefile_in
diff -N patches/patch-tests_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-tests_Makefile_in 13 Nov 2012 11:33:59 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- tests/Makefile.in.orig Mon Nov 12 13:04:07 2012
tests/Makefile.in Mon Nov 12 13:04:37 2012
+@@ -249,7 +249,7 @@ test_SOURCES = test.cpp \
+ test_CPPFLAGS = $(WX_CPPFLAGS)
+ test_CXXFLAGS = $(WX_CXXFLAGS_ONLY) $(CPPUNIT_CFLAGS)
+ test_LDFLAGS = $(CPPUNIT_LIBS) ../src/engine/libengine.a \
+- $(LIBGNUTLS_LIBS) $(WX_LIBS) $(IDN_LIB)
++ $(LIBGNUTLS_LIBS) $(WX_LIBS) $(IDN_LIB) $(LIBSQLITE3_LIBS)
+ test_DEPENDENCIES = ../src/engine/libengine.a
+ all: all-am
+
Index: pkg/PLIST
===
RCS file:
Re: result of modern kde4 integration into cvs build
On 2012/11/12 22:11, Nigel Taylor wrote:
g77 diff was posted to ports@ before 22/09, then put into openbsd-wip so
it wasn't lost, waiting on comments. A new diff is attached, because it
includes additional changes since the original post to ports@, includes
the change for mip64el also posted to ports@ 22/10.
Things in openbsd-wip do tend to get lost, it's good as a place for
working on things, but imo the usual process of sending out diffs and
reminders by mail is still needed.
I have been building ports with this in place both for amd64 and i386.
It is only a fix for runtime /regress dependencies and being able to run
regression tests.
As far as kde4 is concerned as long as libf2c is installed at runtime
the existing g77 in the ports tree should work, apart from mips64el.
-NOT_FOR_ARCHS = ${GCC2_ARCHS}
+ONLY_FOR_ARCHS = ${GCC4_ARCHS}
I think this line should stay as-is, in case any other arch are moved to
gcc3. I'm OK with the remainder of the Makefile diff + distinfo.
Re: the change in the config.gcc patch for mips64el; first off I think
that should be committed as a separate diff later, as it's unrelated to the
other changes in this diff, but also it needs looking at in more detail
because it affects mips64 as well as mips64el.
Re: result of modern kde4 integration into cvs build
On Mon, Nov 12, 2012 at 05:02:01PM -0600, Amit Kulkarni wrote: On Mon, Nov 12, 2012 at 3:09 PM, Vadim Zhukov persg...@gmail.com wrote: 2012/11/12 Amit Kulkarni amitk...@gmail.com: all pkgs in kde4 pass compilation with fixes pushed into openbsd-wip... Compiled with cmake 2.8.10. Some small issues while I build kde3 and then the rest of the ports!!!. Just to be clear: do you want to make KDE 3 and 4 co-build or co-exist? Both goals are hard to achieve... co-build with dpb -J removing dependencies along the way. This won't work. This requires lots of hand-holding. dpb will just error out. You will end up with two dpb runs. Here is a bird's eye overview of the choices. Currently we have a rather full set of kde3 which works reasonably well. For kde4 to replace that, we need to have *most* applications that were in kde3 working. Yes, this includes most of koffice, digikam, amarok, gwenview... just for applications I'm aware of. I'm not sure kde4 can replace that on every architecture. kde4 was created later, and it's going to use functionalities that might be hard to achieve on older platforms. For instance, all of kde games have switched from bitmaps to SVG. I'm not sure that's reasonable for old platforms. trinity might be a good intermediate point. It's still a lot of work, as the build system is radically different from kde3, so it requires creating new ports (but you can probably lift most of the useful code from kde3). (for those that don't know, trinity is supposed to be kde3 ported to qt4, thus requiring one single qt for both kde3 and kde4). *ideally*, kde3 and kde4 *should* both be able to build on the same box. Using dpb twice is cumbersome at best, and not very realistic for any long term use. That was actually one blocking issue back when I played a bit with kde4. Being able to run both kde3 and kde4 would be best, but at least building stuff on the same box without having to wipe things out would be good. (this requires libraries in distinct directories with symlinks, and some other stuff duplicated, like a separate include dir, possibly a separate pkgconfig dir, and some renamed stuff... I did something awfully similar with qt4 wrt qtconfig/moc... it's not impossible, but it's work). What can be done currently without problems: - update the ports sthen pointed out, either because they're not even used currently, or check carefully that updating them won't give us any hardship. - import more kde4 stuff that's independent from existing stuff. - link all that to the build. Make sure it doesn't break any of the existing stuff. - try to arrange kde4/kde3/trinity to give it a chance to build concurrently. Preferably before import, as it's much easier to do these changes before import. - import kde4 so that people can play with it. If it's easy to build, then people can play with it manually. Even if dpb can't build it all... (maybe at that point we'll have trinity too). Then we will have enough data points to know where to go... it might be that it's actually okay to switch to kde4, and that it's good enough on most architectures. I'm not too sure of that. Note that those steps require careful validations. I've left out some important stuff, like fixing qt4 somewhat, dealing with cmake files, dealing with the phonon mess...
Re: scribus displays strangely and emits errors
On Mon, 12 Nov 2012 14:09:51 -0800 Tim Howe th...@bendtel.net wrote: On a fresh 5.2 install after installing scribus from the pre-compiled package it displays in an unusable way and emits errors like so: libpng warning: Duplicate iCCP chunk libpng warning: Duplicate iCCP chunk QNativeImage: Unable to attach to shared memory segment. X Error: BadDrawable (invalid Pixmap or Window parameter) 9 Major opcode: 62 (X_CopyArea) Resource id: 0x0 X Error: BadDrawable (invalid Pixmap or Window parameter) 9 Major opcode: 62 (X_CopyArea) Resource id: 0x0 X Error: BadDrawable (invalid Pixmap or Window parameter) 9 Major opcode: 62 (X_CopyArea) Resource id: 0x0 X Error: BadDrawable (invalid Pixmap or Window parameter) 9 Major opcode: 62 (X_CopyArea) Resource id: 0x0 X Error: BadDrawable (invalid Pixmap or Window parameter) 9 Major opcode: 62 (X_CopyArea) Resource id: 0x0 QNativeImage: Unable to attach to shared memory segment. X Error: BadDrawable (invalid Pixmap or Window parameter) 9 Major opcode: 62 (X_CopyArea) Resource id: 0x0 X Error: BadDrawable (invalid Pixmap or Window parameter) 9 Major opcode: 62 (X_CopyArea) Resource id: 0x0 X Error: BadDrawable (invalid Pixmap or Window parameter) 9 Major opcode: 62 (X_CopyArea) Resource id: 0x0 X Error: BadDrawable (invalid Pixmap or Window parameter) 9 Major opcode: 62 (X_CopyArea) Resource id: 0x0 X Error: BadDrawable (invalid Pixmap or Window parameter) 9 Major opcode: 62 (X_CopyArea) Resource id: 0x0 This appears to no longer be the case after a cold boot. Funny. --TimH
Re: result of modern kde4 integration into cvs build
On Tue, Nov 13, 2012 at 05:27:33PM +0100, Marc Espie wrote: On Mon, Nov 12, 2012 at 05:02:01PM -0600, Amit Kulkarni wrote: On Mon, Nov 12, 2012 at 3:09 PM, Vadim Zhukov persg...@gmail.com wrote: 2012/11/12 Amit Kulkarni amitk...@gmail.com: all pkgs in kde4 pass compilation with fixes pushed into openbsd-wip... Compiled with cmake 2.8.10. Some small issues while I build kde3 and then the rest of the ports!!!. Just to be clear: do you want to make KDE 3 and 4 co-build or co-exist? Both goals are hard to achieve... co-build with dpb -J removing dependencies along the way. This won't work. This requires lots of hand-holding. dpb will just error out. You will end up with two dpb runs. Here is a bird's eye overview of the choices. Currently we have a rather full set of kde3 which works reasonably well. For kde4 to replace that, we need to have *most* applications that were in kde3 working. Yes, this includes most of koffice, digikam, amarok, gwenview... just for applications I'm aware of. I'm not sure kde4 can replace that on every architecture. kde4 was created later, and it's going to use functionalities that might be hard to achieve on older platforms. For instance, all of kde games have switched from bitmaps to SVG. I'm not sure that's reasonable for old platforms. trinity might be a good intermediate point. It's still a lot of work, as the build system is radically different from kde3, so it requires creating new ports (but you can probably lift most of the useful code from kde3). (for those that don't know, trinity is supposed to be kde3 ported to qt4, thus requiring one single qt for both kde3 and kde4). *Meep* Wrong. Atm, trinity 3.5.13.1 is still in Qt3 (and trinity took over Qt3 maintainership unofficially from nokia). The Qt4 port is far from complete and quite stalled, see http://www.trinitydesktop.org/wiki/bin/view/Developers/RoadMap 3.5.14/port to qt4 was originally expected this fall. Landry
Re: result of modern kde4 integration into cvs build
On Tue, Nov 13, 2012 at 11:29:52AM -0600, Amit Kulkarni wrote: I'm not sure kde4 can replace that on every architecture. kde4 was created later, and it's going to use functionalities that might be hard to achieve on older platforms. For instance, all of kde games have switched from bitmaps to SVG. I'm not sure that's reasonable for old platforms. some are going to be dropped, we will find out when it goes through bulk. if the platform doesn't support .xz distfiles, cmake and qt4 then its unsupported. it all compile in 1G datasize, not astronomical like firefox, and old rakudo. You can figure that out for yourself instead of speculating. Like: check the release directories for 5.1/5.2. What arches have qt3 and kde3 ? what arches don't have xz ? is this an actual problem ? unfortunately very much added work. some options: Duh. Why do you think we didn't move to kde4 so far. Answer: both because it was unstable until about kde 4.4, and also because there IS work to be done. 1) adjust kde3 with /usr/local/kde3/* (i.e include, libs, bin) + have kde4 with /usr/local/kde4/*. both independent. is it too hard to add this for kde3? I don't know. You tell me. 2) move to trinity with /usr/local/trinity/*, adjust the quirks and provide an upgrade path for kde3 + have kde4 with /usr/local/kde4/*. both independent. Depends on having trinity up and running. 3) add tde (/usr/local/tde/*) + kde4 (/usr/local/kde4/*) + kde3 (/usr/local/kde3/*), then remove kde3 after sometime, providing upgrade for kde3 users. all independent. probably desireable. what about the problem of incompatibility for kde3 - kde4 or tde - kde4? I don't know. You tell me how much incompatibility there is. keep in mind, future kde5 is released late next year it should have /usr/local/kde5/*? I'm not at all sure kde5 will be THAT incompatible to kde4. - try to arrange kde4/kde3/trinity to give it a chance to build concurrently. Preferably before import, as it's much easier to do these changes before import. this implies option 3 above: all should be built concurrently. Ideally, yes. At least make an effort to make that work. If it turns out to be impossible, we'll deal. But we should at least try that.
Re: result of modern kde4 integration into cvs build
On Mon, 12 Nov 2012 22:11:44 +, Nigel Taylor wrote:
On 11/12/12 19:48, Stuart Henderson wrote:
big cc list trimmed, everyone interested in this should be on ports@,
right?
On 2012/11/12 13:25, Amit Kulkarni wrote:
cd /usr/ports/openbsd-wip git pull
mv /usr/ports/databases/strigi /usr/ports/databases/strigi.old
mv /usr/ports/multimedia/phonon/usr/ports/multimedia/phonon.old
these two aren't linked to the build yet, so these might as well
just get updated in cvs.
mv /usr/ports/graphics/dcmtk /usr/ports/graphics/dcmtk.old
mv /usr/ports/graphics/opencv /usr/ports/graphics/opencv.old
nothing depends on these, if they work ok then these should be fairly
straightforward to update too.
mv /usr/ports/graphics/liblqr /usr/ports/graphics/liblqr.old
does liquid-rescale work OK with the newer version?
mv /usr/ports/lang/g77 /usr/ports/lang/g77.old
what's the status of this? have the various ports in-tree
which depend on g77 been tested with it?
So how about CVS diffs for these so they can be tested/committed?
openbsd-wip is fine as a shared tree for development work, but
when it comes time to try and get these things in, the usual
process with sending out diffs is the way forward (in manageable
pieces please, i.e. unless a bunch of things must all be updated
at the same time to avoid breakage like the rdf things then
work on getting one or two in, then move on to the next things;
a flood of diffs all at once will usually just get ignored as
people are too overloaded ;)
g77 diff was posted to ports@ before 22/09, then put into openbsd-wip so
it wasn't lost, waiting on comments. A new diff is attached, because it
includes additional changes since the original post to ports@, includes
the change for mip64el also posted to ports@ 22/10.
I have been building ports with this in place both for amd64 and i386.
It is only a fix for runtime /regress dependencies and being able to run
regression tests.
As far as kde4 is concerned as long as libf2c is installed at runtime
the existing g77 in the ports tree should work, apart from mips64el.
Index: Makefile
===
RCS file: /home/cvs/ports/lang/g77/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile 1 Sep 2012 00:00:32 - 1.18
+++ Makefile 10 Nov 2012 11:22:11 -
@@ -1,16 +1,17 @@
# $OpenBSD: Makefile,v 1.18 2012/09/01 00:00:32 pascal Exp $
-NOT_FOR_ARCHS = ${GCC2_ARCHS}
+ONLY_FOR_ARCHS = ${GCC4_ARCHS}
V = 3.3.5
PKGNAME =g77-$V
-REVISION = 5
+REVISION = 6
EPOCH = 0
DISTFILES = g77-openbsd.tgz
CONFIG = ${MACHINE_ARCH}-unknown-openbsd${OSREV}
SUBST_VARS +=CONFIG V
SYSV = 4.2.1
+SYSLIBPATH = `cc -v 21| sed -n -e
'/gcc-lib/s%^[^/]*\(/.*\)/[^/]*%\1%p'`
COMMENT =GNU fortran 77 compiler
CATEGORIES = lang math
@@ -21,6 +22,10 @@ PERMIT_PACKAGE_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
PERMIT_PACKAGE_FTP = Yes
+RUN_DEPENDS =devel/libf2c
+REGRESS_DEPENDS =devel/dejagnu \
+ devel/libf2c
+
WRKDIST =${WRKDIR}/g77
CONFIGURE_SCRIPT = ${WRKDIST}/gcc/configure
@@ -67,12 +72,16 @@ ALL_TARGET = all doc
INSTALL_TARGET = install-common f77.install-info f77.install-normal
post-install:
- ln -sf /usr/lib/gcc-lib/${CONFIG}/${SYSV}/libgcc.a
${PREFIX}/lib/gcc-lib/${CONFIG}/$V/libgcc.a
- ln -s /usr/lib/gcc-lib/${CONFIG}/${SYSV}/cc1
${PREFIX}/lib/gcc-lib/${CONFIG}/$V/cc1
+ ln -sf ${SYSLIBPATH}/libgcc.a
${PREFIX}/lib/gcc-lib/${CONFIG}/$V/libgcc.a
+ ln -s ${SYSLIBPATH}/cc1 ${PREFIX}/lib/gcc-lib/${CONFIG}/$V/cc1
${INSTALL_MAN} ${WRKBUILD}/f/g77.1 ${PREFIX}/man/man1/g77.1
cd ${PREFIX}/man/man1 ln -f g77.1 f77.1
cd ${PREFIX}/bin ln -f g77 f77
WANTLIB =c iberty
+
+pre-regress:
+ ln -sf ${SYSLIBPATH}/libgcc.a ${WRKBUILD}/libgcc.a
+ ln -s ${SYSLIBPATH}/cc1 ${WRKBUILD}/cc1
.include bsd.port.mk
Index: distinfo
===
RCS file: /home/cvs/ports/lang/g77/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 24 May 2010 22:43:57 - 1.1.1.1
+++ distinfo 9 Nov 2012 14:53:08 -
@@ -1,5 +1,2 @@
-MD5 (g77-openbsd.tgz) = RkFBHVXXRFefnZJtD7CzNw==
-RMD160 (g77-openbsd.tgz) = FxIFG017fw7XNFqBbZ5u62FMXjc=
-SHA1 (g77-openbsd.tgz) = c5SUxU68KXKPI9JuX1zP3tginiU=
SHA256 (g77-openbsd.tgz) = QMSj29yw1B9Oa8OwyliN72S3RF1OPXT8wDG1X+KJhEo=
SIZE (g77-openbsd.tgz) = 14445321
Index: patches/patch-gcc_config_gcc
Re: result of modern kde4 integration into cvs build
2012/11/13 Marc Espie es...@nerim.net: On Tue, Nov 13, 2012 at 11:29:52AM -0600, Amit Kulkarni wrote: I'm not sure kde4 can replace that on every architecture. kde4 was created later, and it's going to use functionalities that might be hard to achieve on older platforms. For instance, all of kde games have switched from bitmaps to SVG. I'm not sure that's reasonable for old platforms. some are going to be dropped, we will find out when it goes through bulk. if the platform doesn't support .xz distfiles, cmake and qt4 then its unsupported. it all compile in 1G datasize, not astronomical like firefox, and old rakudo. You can figure that out for yourself instead of speculating. Like: check the release directories for 5.1/5.2. What arches have qt3 and kde3 ? what arches don't have xz ? is this an actual problem ? Side note: TDE will probably have porting problems too due to limited number of contributors. There are actually two people that do most programmer's work, and a few porting enthusiasts. So do TDE could not replace KDE3 fully. :( From the other side, slower archs probably will use XFCE, LXDE or something custom... Unfortunately I do not have access to anything but i386 now. :( 1) adjust kde3 with /usr/local/kde3/* (i.e include, libs, bin) + have kde4 with /usr/local/kde4/*. both independent. is it too hard to add this for kde3? I don't know. You tell me. Not too hard for KDE 4. But I still hope to find better way than this /opt-ism. My personal goal is to make KDE 4 co-build with KDE 3, and to make libs and pimlibs from KDE 4 co-exist with KDE 3. But I didn't even started moving in that direction, there is too much other work. 2) move to trinity with /usr/local/trinity/*, adjust the quirks and provide an upgrade path for kde3 + have kde4 with /usr/local/kde4/*. both independent. Depends on having trinity up and running. 3) add tde (/usr/local/tde/*) + kde4 (/usr/local/kde4/*) + kde3 (/usr/local/kde3/*), then remove kde3 after sometime, providing upgrade for kde3 users. all independent. probably desireable. what about the problem of incompatibility for kde3 - kde4 or tde - kde4? I don't know. You tell me how much incompatibility there is. This could not be done fully automatical. We could probably use some stuff from OpenSUSE, they did amazing work on making transition transparent, but even there were a lot of problems. keep in mind, future kde5 is released late next year it should have /usr/local/kde5/*? I'm not at all sure kde5 will be THAT incompatible to kde4. Yes, we could treat KDE 5 the same way as KDE 4. KDE 5 will just replace KDE 4. - try to arrange kde4/kde3/trinity to give it a chance to build concurrently. Preferably before import, as it's much easier to do these changes before import. this implies option 3 above: all should be built concurrently. Ideally, yes. At least make an effort to make that work. If it turns out to be impossible, we'll deal. But we should at least try that. I have some crazy ideas like porting KDE3 to CMake, but before talking loud about them sound I should try to try starting myself. -- WBR, Vadim Zhukov
Re: result of modern kde4 integration into cvs build
On Tue, Nov 13, 2012 at 09:04:40PM +0300, Vadim Zhukov wrote: From the other side, slower archs probably will use XFCE, LXDE or something custom... Unfortunately I do not have access to anything but i386 now. :( I know some people who are just using konqueror from kde3 for quick browsing on simple sites. I'm not kidding. It's still a very fast all-purpose browser. 1) adjust kde3 with /usr/local/kde3/* (i.e include, libs, bin) + have kde4 with /usr/local/kde4/*. both independent. is it too hard to add this for kde3? I don't know. You tell me. Not too hard for KDE 4. But I still hope to find better way than this /opt-ism. My personal goal is to make KDE 4 co-build with KDE 3, and to make libs and pimlibs from KDE 4 co-exist with KDE 3. But I didn't even started moving in that direction, there is too much other work. I did a bit of that work, like actually moving the kde3 libs out of the way into /usr/local/lib/kde3... having kde3 use libtool also helps picking up the right libraries (I have to fix the one kde package that still wants gnu libtool though). I won't object to *finishing* that in tree *if we have a plan*. That means, preferably import the kde4 parts after the directories are mapped out so that there's little conflict with kde3. I have some crazy ideas like porting KDE3 to CMake, but before talking loud about them sound I should try to try starting myself. No, that's crazy. You said trinity was hard to do. Changing kde3 to cmake more or less requires redoing what the kde people did between kde3 and kde4 and that was a LOT of work. *most* of the autoconf stuff in kde3 is reasonably easy to move around. It may require testing, obviously...
Re: result of modern kde4 integration into cvs build
On Tue, Nov 13, 2012 at 06:46:47PM +0100, Landry Breuil wrote: trinity might be a good intermediate point. It's still a lot of work, as the build system is radically different from kde3, so it requires creating new ports (but you can probably lift most of the useful code from kde3). (for those that don't know, trinity is supposed to be kde3 ported to qt4, thus requiring one single qt for both kde3 and kde4). *Meep* Wrong. Atm, trinity 3.5.13.1 is still in Qt3 (and trinity took over Qt3 maintainership unofficially from nokia). The Qt4 port is far from complete and quite stalled, see http://www.trinitydesktop.org/wiki/bin/view/Developers/RoadMap 3.5.14/port to qt4 was originally expected this fall. Nope, I'm going to nitpick, but what I said was factually *right*. I know you sometimes have problems with english, but notice the trinity is SUPPOSED to be kde3 ported to qt4... (emphasis added for clarity) I'm perfectly aware that work wasn't finished last time I looked...
Re: result of modern kde4 integration into cvs build
1) adjust kde3 with /usr/local/kde3/* (i.e include, libs, bin) + have kde4 with /usr/local/kde4/*. both independent. is it too hard to add this for kde3? I don't know. You tell me. Not too hard for KDE 4. But I still hope to find better way than this /opt-ism. My personal goal is to make KDE 4 co-build with KDE 3, and to make libs and pimlibs from KDE 4 co-exist with KDE 3. But I didn't even started moving in that direction, there is too much other work. I did a bit of that work, like actually moving the kde3 libs out of the way into /usr/local/lib/kde3... having kde3 use libtool also helps picking up the right libraries (I have to fix the one kde package that still wants gnu libtool though). I won't object to *finishing* that in tree *if we have a plan*. That means, preferably import the kde4 parts after the directories are mapped out so that there's little conflict with kde3. I have some crazy ideas like porting KDE3 to CMake, but before talking loud about them sound I should try to try starting myself. No, that's crazy. You said trinity was hard to do. Changing kde3 to cmake more or less requires redoing what the kde people did between kde3 and kde4 and that was a LOT of work. *most* of the autoconf stuff in kde3 is reasonably easy to move around. It may require testing, obviously... Ok its option 1: separate out kde4 and kde3 to use different folders under /usr/local both for simultaneous building and running. I will submit the ports needed for kde4 and then Vadim/me finish KDE 4.9.3 by relocating to different folders in /usr/local (4.9.2 doesn't have working pim). Then before the kde4 merge, the kde3 stuff has to be shifted to different folder. Trinity merge can come later.
Re: result of modern kde4 integration into cvs build
2012/11/13 Marc Espie es...@nerim.net: On Tue, Nov 13, 2012 at 09:04:40PM +0300, Vadim Zhukov wrote: From the other side, slower archs probably will use XFCE, LXDE or something custom... Unfortunately I do not have access to anything but i386 now. :( I know some people who are just using konqueror from kde3 for quick browsing on simple sites. I'm not kidding. It's still a very fast all-purpose browser. 1) adjust kde3 with /usr/local/kde3/* (i.e include, libs, bin) + have kde4 with /usr/local/kde4/*. both independent. is it too hard to add this for kde3? I don't know. You tell me. Not too hard for KDE 4. But I still hope to find better way than this /opt-ism. My personal goal is to make KDE 4 co-build with KDE 3, and to make libs and pimlibs from KDE 4 co-exist with KDE 3. But I didn't even started moving in that direction, there is too much other work. I did a bit of that work, like actually moving the kde3 libs out of the way into /usr/local/lib/kde3... having kde3 use libtool also helps picking up the right libraries (I have to fix the one kde package that still wants gnu libtool though). I won't object to *finishing* that in tree *if we have a plan*. That means, preferably import the kde4 parts after the directories are mapped out so that there's little conflict with kde3. I have some crazy ideas like porting KDE3 to CMake, but before talking loud about them sound I should try to try starting myself. No, that's crazy. You said trinity was hard to do. Changing kde3 to cmake more or less requires redoing what the kde people did between kde3 and kde4 and that was a LOT of work. *most* of the autoconf stuff in kde3 is reasonably easy to move around. It may require testing, obviously... I should note that CMake evolved a LOT from KDE 4.0 till now. And KDE developers worked hard on this. So porting KDE 3 will re-use a lot of stuff we already have in CMake. Another side note: KDE 4 just moves to CMake 2.8.8 from CMake 2.6. Why not CMake 2.8.9? - because many Linux distros lacks fresh CMake, he-he... -- WBR, Vadim Zhukov
Re: result of modern kde4 integration into cvs build
2012/11/13 Amit Kulkarni amitk...@gmail.com:
1) adjust kde3 with /usr/local/kde3/* (i.e include, libs, bin) + have
kde4 with /usr/local/kde4/*. both independent. is it too hard to add
this for kde3?
I don't know. You tell me.
Not too hard for KDE 4. But I still hope to find better way than this
/opt-ism.
My personal goal is to make KDE 4 co-build with KDE 3, and to make
libs and pimlibs from KDE 4 co-exist with KDE 3. But I didn't even
started moving in that direction, there is too much other work.
I did a bit of that work, like actually moving the kde3 libs out of the
way into /usr/local/lib/kde3... having kde3 use libtool also helps picking
up the right libraries (I have to fix the one kde package that still wants
gnu libtool though).
I won't object to *finishing* that in tree *if we have a plan*. That means,
preferably import the kde4 parts after the directories are mapped out so
that there's little conflict with kde3.
I have some crazy ideas like porting KDE3 to CMake, but before talking
loud about them sound I should try to try starting myself.
No, that's crazy. You said trinity was hard to do. Changing kde3 to cmake
more or less requires redoing what the kde people did between kde3 and kde4
and that was a LOT of work.
*most* of the autoconf stuff in kde3 is reasonably easy to move around. It
may require testing, obviously...
Ok its option 1: separate out kde4 and kde3 to use different folders
under /usr/local both for simultaneous building and running. I will
submit the ports needed for kde4 and then Vadim/me finish KDE 4.9.3 by
relocating to different folders in /usr/local (4.9.2 doesn't have
working pim). Then before the kde4 merge, the kde3 stuff has to be
shifted to different folder.
KDE 3 is already separated enough, thanks (a lot!) to Marc. I've
thought to follow the same scheme when started hacking on KDE4 but it
was a bit harder. Even using ${PREFIX}/libexec became a challenge
due to many hardcoded paths. :(
--
WBR,
Vadim Zhukov
Re: result of modern kde4 integration into cvs build
On Tue, Nov 13, 2012 at 12:34:23PM -0600, Amit Kulkarni wrote:
1) adjust kde3 with /usr/local/kde3/* (i.e include, libs, bin) + have
kde4 with /usr/local/kde4/*. both independent. is it too hard to add
this for kde3?
I don't know. You tell me.
Not too hard for KDE 4. But I still hope to find better way than this
/opt-ism.
My personal goal is to make KDE 4 co-build with KDE 3, and to make
libs and pimlibs from KDE 4 co-exist with KDE 3. But I didn't even
started moving in that direction, there is too much other work.
I did a bit of that work, like actually moving the kde3 libs out of the
way into /usr/local/lib/kde3... having kde3 use libtool also helps picking
up the right libraries (I have to fix the one kde package that still wants
gnu libtool though).
I won't object to *finishing* that in tree *if we have a plan*. That means,
preferably import the kde4 parts after the directories are mapped out so
that there's little conflict with kde3.
I have some crazy ideas like porting KDE3 to CMake, but before talking
loud about them sound I should try to try starting myself.
No, that's crazy. You said trinity was hard to do. Changing kde3 to cmake
more or less requires redoing what the kde people did between kde3 and kde4
and that was a LOT of work.
*most* of the autoconf stuff in kde3 is reasonably easy to move around. It
may require testing, obviously...
Ok its option 1: separate out kde4 and kde3 to use different folders
under /usr/local both for simultaneous building and running. I will
submit the ports needed for kde4 and then Vadim/me finish KDE 4.9.3 by
relocating to different folders in /usr/local (4.9.2 doesn't have
working pim). Then before the kde4 merge, the kde3 stuff has to be
shifted to different folder.
Please, dont say fuck to the FHS. New toplevel dirs under /usr/local
should be used only for a very valid reason. We have lib/ bin/ include/
share/ for a reason; so try to use lib/kde{,4} (as the current x11/kde4
port does unless i'm mistaken), include/kde{,4}, share/doc/kde{,4},
bin/kde{,4} for the ones which conflict, etc..
And do it in both kdes at the same time. This is not oh i'll look into
it later stuff.
Landry
Re: result of modern kde4 integration into cvs build
On Tue, Nov 13, 2012 at 12:43 PM, Landry Breuil lan...@rhaalovely.net wrote:
On Tue, Nov 13, 2012 at 12:34:23PM -0600, Amit Kulkarni wrote:
1) adjust kde3 with /usr/local/kde3/* (i.e include, libs, bin) + have
kde4 with /usr/local/kde4/*. both independent. is it too hard to add
this for kde3?
I don't know. You tell me.
Not too hard for KDE 4. But I still hope to find better way than this
/opt-ism.
My personal goal is to make KDE 4 co-build with KDE 3, and to make
libs and pimlibs from KDE 4 co-exist with KDE 3. But I didn't even
started moving in that direction, there is too much other work.
I did a bit of that work, like actually moving the kde3 libs out of the
way into /usr/local/lib/kde3... having kde3 use libtool also helps picking
up the right libraries (I have to fix the one kde package that still wants
gnu libtool though).
I won't object to *finishing* that in tree *if we have a plan*. That means,
preferably import the kde4 parts after the directories are mapped out so
that there's little conflict with kde3.
I have some crazy ideas like porting KDE3 to CMake, but before talking
loud about them sound I should try to try starting myself.
No, that's crazy. You said trinity was hard to do. Changing kde3 to cmake
more or less requires redoing what the kde people did between kde3 and kde4
and that was a LOT of work.
*most* of the autoconf stuff in kde3 is reasonably easy to move around. It
may require testing, obviously...
Ok its option 1: separate out kde4 and kde3 to use different folders
under /usr/local both for simultaneous building and running. I will
submit the ports needed for kde4 and then Vadim/me finish KDE 4.9.3 by
relocating to different folders in /usr/local (4.9.2 doesn't have
working pim). Then before the kde4 merge, the kde3 stuff has to be
shifted to different folder.
Please, dont say fuck to the FHS. New toplevel dirs under /usr/local
should be used only for a very valid reason. We have lib/ bin/ include/
share/ for a reason; so try to use lib/kde{,4} (as the current x11/kde4
port does unless i'm mistaken), include/kde{,4}, share/doc/kde{,4},
bin/kde{,4} for the ones which conflict, etc..
And do it in both kdes at the same time. This is not oh i'll look into
it later stuff.
Landry, this is what we are going to follow. Although in a previous
email I did write /usr/local/kde4/*. Thanks for the cluestick.
Re: result of modern kde4 integration into cvs build
I know some people who are just using konqueror from kde3 for quick browsing on simple sites. I'm not kidding. It's still a very fast all-purpose browser. I've recently switched back to konqueror as file manager on any system with kde because Dolphin has removed the find files option and the inbuilt find dialog is impotent. It may be handy for a quick search but that's no reason to remove the handy link to the more powerful find files (kfind) under tools. This reminds me of Gnome removing features without enough thought/peer review and worries me. I already used konqueror for it's great filesize view plugin so just switched that to default file manager, rather than create an action. Does anyone know if Konqueror 4 can be built statically. I'd love to use it on all my desktops instead of nautilus and thunar, without pulling in the whole of KDE? -- ___ 'Write programs that do one thing and do it well. Write programs to work together. Write programs to handle text streams, because that is a universal interface' (Doug McIlroy) ___
Re: result of modern kde4 integration into cvs build
On 11/13/12 12:53, Pascal Stumpf wrote:
On Mon, 12 Nov 2012 22:11:44 +, Nigel Taylor wrote:
On 11/12/12 19:48, Stuart Henderson wrote:
big cc list trimmed, everyone interested in this should be on ports@,
right?
On 2012/11/12 13:25, Amit Kulkarni wrote:
cd /usr/ports/openbsd-wip git pull
mv /usr/ports/databases/strigi /usr/ports/databases/strigi.old
mv /usr/ports/multimedia/phonon/usr/ports/multimedia/phonon.old
these two aren't linked to the build yet, so these might as well
just get updated in cvs.
mv /usr/ports/graphics/dcmtk /usr/ports/graphics/dcmtk.old
mv /usr/ports/graphics/opencv /usr/ports/graphics/opencv.old
nothing depends on these, if they work ok then these should be fairly
straightforward to update too.
mv /usr/ports/graphics/liblqr /usr/ports/graphics/liblqr.old
does liquid-rescale work OK with the newer version?
mv /usr/ports/lang/g77 /usr/ports/lang/g77.old
what's the status of this? have the various ports in-tree
which depend on g77 been tested with it?
So how about CVS diffs for these so they can be tested/committed?
openbsd-wip is fine as a shared tree for development work, but
when it comes time to try and get these things in, the usual
process with sending out diffs is the way forward (in manageable
pieces please, i.e. unless a bunch of things must all be updated
at the same time to avoid breakage like the rdf things then
work on getting one or two in, then move on to the next things;
a flood of diffs all at once will usually just get ignored as
people are too overloaded ;)
g77 diff was posted to ports@ before 22/09, then put into openbsd-wip so
it wasn't lost, waiting on comments. A new diff is attached, because it
includes additional changes since the original post to ports@, includes
the change for mip64el also posted to ports@ 22/10.
I have been building ports with this in place both for amd64 and i386.
It is only a fix for runtime /regress dependencies and being able to run
regression tests.
As far as kde4 is concerned as long as libf2c is installed at runtime
the existing g77 in the ports tree should work, apart from mips64el.
Index: Makefile
===
RCS file: /home/cvs/ports/lang/g77/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile 1 Sep 2012 00:00:32 - 1.18
+++ Makefile 10 Nov 2012 11:22:11 -
@@ -1,16 +1,17 @@
# $OpenBSD: Makefile,v 1.18 2012/09/01 00:00:32 pascal Exp $
-NOT_FOR_ARCHS = ${GCC2_ARCHS}
+ONLY_FOR_ARCHS =${GCC4_ARCHS}
V = 3.3.5
PKGNAME = g77-$V
-REVISION = 5
+REVISION = 6
EPOCH = 0
DISTFILES = g77-openbsd.tgz
CONFIG =${MACHINE_ARCH}-unknown-openbsd${OSREV}
SUBST_VARS += CONFIG V
SYSV = 4.2.1
+SYSLIBPATH = `cc -v 21| sed -n -e
'/gcc-lib/s%^[^/]*\(/.*\)/[^/]*%\1%p'`
COMMENT = GNU fortran 77 compiler
CATEGORIES =lang math
@@ -21,6 +22,10 @@ PERMIT_PACKAGE_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
PERMIT_PACKAGE_FTP =Yes
+RUN_DEPENDS = devel/libf2c
+REGRESS_DEPENDS = devel/dejagnu \
+devel/libf2c
+
WRKDIST = ${WRKDIR}/g77
CONFIGURE_SCRIPT = ${WRKDIST}/gcc/configure
@@ -67,12 +72,16 @@ ALL_TARGET = all doc
INSTALL_TARGET =install-common f77.install-info f77.install-normal
post-install:
-ln -sf /usr/lib/gcc-lib/${CONFIG}/${SYSV}/libgcc.a
${PREFIX}/lib/gcc-lib/${CONFIG}/$V/libgcc.a
-ln -s /usr/lib/gcc-lib/${CONFIG}/${SYSV}/cc1
${PREFIX}/lib/gcc-lib/${CONFIG}/$V/cc1
+ln -sf ${SYSLIBPATH}/libgcc.a
${PREFIX}/lib/gcc-lib/${CONFIG}/$V/libgcc.a
+ln -s ${SYSLIBPATH}/cc1 ${PREFIX}/lib/gcc-lib/${CONFIG}/$V/cc1
${INSTALL_MAN} ${WRKBUILD}/f/g77.1 ${PREFIX}/man/man1/g77.1
cd ${PREFIX}/man/man1 ln -f g77.1 f77.1
cd ${PREFIX}/bin ln -f g77 f77
WANTLIB = c iberty
+
+pre-regress:
+ln -sf ${SYSLIBPATH}/libgcc.a ${WRKBUILD}/libgcc.a
+ln -s ${SYSLIBPATH}/cc1 ${WRKBUILD}/cc1
.include bsd.port.mk
Index: distinfo
===
RCS file: /home/cvs/ports/lang/g77/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 24 May 2010 22:43:57 - 1.1.1.1
+++ distinfo 9 Nov 2012 14:53:08 -
@@ -1,5 +1,2 @@
-MD5 (g77-openbsd.tgz) = RkFBHVXXRFefnZJtD7CzNw==
-RMD160 (g77-openbsd.tgz) = FxIFG017fw7XNFqBbZ5u62FMXjc=
-SHA1 (g77-openbsd.tgz) = c5SUxU68KXKPI9JuX1zP3tginiU=
SHA256 (g77-openbsd.tgz) = QMSj29yw1B9Oa8OwyliN72S3RF1OPXT8wDG1X+KJhEo=
SIZE (g77-openbsd.tgz) = 14445321
Index: patches/patch-gcc_config_gcc
Re: result of modern kde4 integration into cvs build
2012/11/13 Kevin Chadwick ma1l1i...@yahoo.co.uk: I know some people who are just using konqueror from kde3 for quick browsing on simple sites. I'm not kidding. It's still a very fast all-purpose browser. I've recently switched back to konqueror as file manager on any system with kde because Dolphin has removed the find files option and the inbuilt find dialog is impotent. It may be handy for a quick search but that's no reason to remove the handy link to the more powerful find files (kfind) under tools. This reminds me of Gnome removing features without enough thought/peer review and worries me. I already used konqueror for it's great filesize view plugin so just switched that to default file manager, rather than create an action. Does anyone know if Konqueror 4 can be built statically. I'd love to use it on all my desktops instead of nautilus and thunar, without pulling in the whole of KDE? It's part of kde-baseapps package, which depends on (either directly or not): kdelibs kdepimlibs kde-runtime kactivities akonadi nepomuk-core ... and some more. It doesn't depend on kde-workspace (shell stuff: KDE panel, tray, desktop widgets etc.), though. -- WBR, Vadim Zhukov
Re: result of modern kde4 integration into cvs build
On Tue, 13 Nov 2012 23:15:31 +0300 Vadim Zhukov wrote: I know some people who are just using konqueror from kde3 for quick browsing on simple sites. I'm not kidding. It's still a very fast all-purpose browser. Does anyone know if Konqueror 4 can be built statically. I'd love to use it on all my desktops instead of nautilus and thunar, without pulling in the whole of KDE? It's part of kde-baseapps package, which depends on (either directly or not): Came across this but from 2006 and expect it's still the case. I guess the mentioned minimalist konqueror embedded may be useful to those who just want the browser but as it's minimalist won't have the other profiles and file management code. http://lists.kde.org/?l=kfm-develm=114138619802527w=2 http://www.konqueror.org/embedded/
Re: result of modern kde4 integration into cvs build
Does anyone know if Konqueror 4 can be built statically. I'd love to use it on all my desktops instead of nautilus and thunar, without pulling in the whole of KDE? The question isn't can - it's is it worth modifying things to build in a different way to how the original authors intended. As this thread shows, it's tough enough even without doing anything custom like this.
kde4 integration diffs: databases/strigi + graphics/dcmtk
for graphics/dcmtk:
Vadim has pushed a whole bunch of stuff. I made sure to pull in the Libtool
stuff that other porters found out and merged them carefully a few weeks ago.
the strigi diff is straightforward.
please review and commit. after this is committed: multimedia/{phonon,
phonon-backend}
? strigi.diff
Index: Makefile
===
RCS file: /cvs/ports/databases/strigi/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile29 Mar 2012 13:38:13 - 1.14
+++ Makefile13 Nov 2012 21:04:57 -
@@ -1,45 +1,52 @@
-# $OpenBSD: Makefile,v 1.14 2012/03/29 13:38:13 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2011/07/07 01:06:59 ajacoutot Exp $
-SHARED_ONLY = Yes
COMMENT = document indexer
CATEGORIES = databases devel textproc sysutils
-HOMEPAGE = http://strigi.sourceforge.net
-DISTNAME = strigi-0.7.2
-
-REVISION = 0
+HOMEPAGE = https://projects.kde.org/projects/kdesupport/strigi/
+DISTNAME = strigi-0.7.7pl1
+SHARED_ONLY = Yes
-EXTRACT_SUFX = .tar.bz2
-MASTER_SITES = http://www.vandenoever.info/software/strigi/ \
- http://spacehopper.org/mirrors/
+MASTER_SITES = ftp://3ps.if.ua/pub/OpenBSD/distfiles/ \
+ http://malcolm.ecentrum.hu/distfiles/ \
+ http://spacehopper.org/mirrors/ \
+ http://www.ohvost.ru/dnl/kde/src/
# LGPLv2+
-PERMIT_PACKAGE_CDROM = Yes
-PERMIT_PACKAGE_FTP = Yes
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
-PERMIT_DISTFILES_FTP = Yes
-
-SHARED_LIBS += searchclient 1.0 # .0.5
-SHARED_LIBS += streamanalyzer 1.0 # .0.5
-SHARED_LIBS += streams1.0 # .0.5
-SHARED_LIBS += strigihtmlgui 1.0 # .0.5
-SHARED_LIBS += strigiqtdbusclient 1.0 # .0.5
+PERMIT_DISTFILES_FTP = Yes
-LIB_DEPENDS = clucene-core-=0.9.21:textproc/clucene \
- archivers/bzip2 \
+SHARED_LIBS += searchclient 1.2 # .0.5
+SHARED_LIBS += streamanalyzer 1.2 # .0.5
+SHARED_LIBS += streams1.2 # .0.5
+SHARED_LIBS += strigihtmlgui 1.2 # .0.5
+SHARED_LIBS += strigiqtdbusclient 1.2 # .0.5
+
+BUILD_DEPENDS =devel/cppunit \
+ devel/boost
+
+LIB_DEPENDS = archivers/bzip2 \
+ graphics/exiv2 \
+ graphics/ffmpeg \
+ sysutils/gamin \
+ textproc/clucene=2.3 \
textproc/libxml \
- x11/qt4 \
- x11/dbus \
- graphics/exiv2
-
-WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender bz2 c clucene=1 dbus-1 exiv2 \
- fontconfig freetype glib-2.0 gthread-2.0 lib/qt4/QtCore \
- lib/qt4/QtDBus lib/qt4/QtGui m png pthread stdc++ xml2 z
${MODLIBICONV_WANTLIB}
-
-MODULES += devel/cmake converters/libiconv
-CONFIGURE_STYLE = cmake
-SEPARATE_BUILD = Yes
+ x11/dbus
+
+WANTLIB = lib/qt4/QtDBus lib/qt4/QtGui
+WANTLIB += bz2 c clucene-core clucene-shared dbus-1 exiv2 fam m pthread
+WANTLIB += stdc++ xml2 z avcodec avformat avutil swscale
+
+MODULES = devel/cmake \
+ converters/libiconv \
+ x11/qt4
+
+# Not ported
+CONFIGURE_ARGS = -DENABLE_LOG4CXX:Bool=No
-CONFIGURE_ARGS += -DHyperEstraier_FOUND:BOOL=0
+# Depends on Java
+CONFIGURE_ARGS += -DENABLE_REGENERATEXSD:Bool=No
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/databases/strigi/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo18 Jun 2010 15:09:41 - 1.6
+++ distinfo13 Nov 2012 21:04:57 -
@@ -1,5 +1,2 @@
-MD5 (strigi-0.7.2.tar.bz2) = ygm6F2zz/+mvzk2S84+ahQ==
-RMD160 (strigi-0.7.2.tar.bz2) = dJcZUzX3bzCSL1xqyq44PhRLM8c=
-SHA1 (strigi-0.7.2.tar.bz2) = tMFHLvBoU2rPnFxMjwM6l/nGn58=
-SHA256 (strigi-0.7.2.tar.bz2) = HKQhu+Qg0YObvmv+fEtSoFWQqben7ad5JLVUyY5gKrg=
-SIZE (strigi-0.7.2.tar.bz2) = 936320
+SHA256 (strigi-0.7.7pl1.tar.gz) = eLltb5+Jw4xu5iBdYv4MPyjYyS0gRCAZOvFK8Rq7IaM=
+SIZE (strigi-0.7.7pl1.tar.gz) = 908466
Index: test.sh
===
RCS file: test.sh
diff -N test.sh
--- /dev/null 1 Jan 1970 00:00:00 -
+++ test.sh 13 Nov 2012 21:04:57 -
@@ -0,0 +1 @@
+ls /usr/ports/openbsd-wip/databases/$1
Index: patches/patch-cmake_FindQt4_cmake
===
RCS file: patches/patch-cmake_FindQt4_cmake
diff -N patches/patch-cmake_FindQt4_cmake
--- patches/patch-cmake_FindQt4_cmake 24 Oct 2007 22:49:38 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,189 +0,0 @@
-$OpenBSD: patch-cmake_FindQt4_cmake,v 1.2 2007/10/24 22:49:38 espie Exp $
cmake/FindQt4.cmake.orig Mon Jul 16 13:26:59 2007
-+++ cmake/FindQt4.cmakeThu Oct 25 00:10:55 2007
-@@ -184,6 +184,19 @@
- # Copyright (c) 2002
Re: result of modern kde4 integration into cvs build
2012/11/14 Kevin Chadwick ma1l1i...@yahoo.co.uk: On Tue, 13 Nov 2012 23:15:31 +0300 Vadim Zhukov wrote: I know some people who are just using konqueror from kde3 for quick browsing on simple sites. I'm not kidding. It's still a very fast all-purpose browser. Does anyone know if Konqueror 4 can be built statically. I'd love to use it on all my desktops instead of nautilus and thunar, without pulling in the whole of KDE? It's part of kde-baseapps package, which depends on (either directly or not): Came across this but from 2006 and expect it's still the case. I guess the mentioned minimalist konqueror embedded may be useful to those who just want the browser but as it's minimalist won't have the other profiles and file management code. http://lists.kde.org/?l=kfm-develm=114138619802527w=2 http://www.konqueror.org/embedded/ KJS doesn't work currently on OpenBSD (problems are related to thread stack manipulation if I recall correctly), and KDE 4 in WIP tree uses kdewebkit engine instead. So what you want is not as easy as porting Konqueror/Embedded. Of course, KJS should be fixed, but there are more critical tasks now, sorry. -- WBR, Vadim Zhukov
Re: kde4 integration diffs: databases/strigi + graphics/dcmtk
On Tue, 13 Nov 2012 15:38:33 -0600
Amit Kulkarni amitk...@gmail.com wrote:
for graphics/dcmtk:
Vadim has pushed a whole bunch of stuff. I made sure to pull in the Libtool
stuff that other porters found out and merged them carefully a few weeks ago.
the strigi diff is straightforward.
please review and commit. after this is committed: multimedia/{phonon,
phonon-backend}
sorry a test.sh snuck into the strigi.diff, resending complete diff again
? strigi.diff
Index: Makefile
===
RCS file: /cvs/ports/databases/strigi/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile29 Mar 2012 13:38:13 - 1.14
+++ Makefile13 Nov 2012 21:04:57 -
@@ -1,45 +1,52 @@
-# $OpenBSD: Makefile,v 1.14 2012/03/29 13:38:13 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2011/07/07 01:06:59 ajacoutot Exp $
-SHARED_ONLY = Yes
COMMENT = document indexer
CATEGORIES = databases devel textproc sysutils
-HOMEPAGE = http://strigi.sourceforge.net
-DISTNAME = strigi-0.7.2
-
-REVISION = 0
+HOMEPAGE = https://projects.kde.org/projects/kdesupport/strigi/
+DISTNAME = strigi-0.7.7pl1
+SHARED_ONLY = Yes
-EXTRACT_SUFX = .tar.bz2
-MASTER_SITES = http://www.vandenoever.info/software/strigi/ \
- http://spacehopper.org/mirrors/
+MASTER_SITES = ftp://3ps.if.ua/pub/OpenBSD/distfiles/ \
+ http://malcolm.ecentrum.hu/distfiles/ \
+ http://spacehopper.org/mirrors/ \
+ http://www.ohvost.ru/dnl/kde/src/
# LGPLv2+
-PERMIT_PACKAGE_CDROM = Yes
-PERMIT_PACKAGE_FTP = Yes
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
-PERMIT_DISTFILES_FTP = Yes
-
-SHARED_LIBS += searchclient 1.0 # .0.5
-SHARED_LIBS += streamanalyzer 1.0 # .0.5
-SHARED_LIBS += streams1.0 # .0.5
-SHARED_LIBS += strigihtmlgui 1.0 # .0.5
-SHARED_LIBS += strigiqtdbusclient 1.0 # .0.5
+PERMIT_DISTFILES_FTP = Yes
-LIB_DEPENDS = clucene-core-=0.9.21:textproc/clucene \
- archivers/bzip2 \
+SHARED_LIBS += searchclient 1.2 # .0.5
+SHARED_LIBS += streamanalyzer 1.2 # .0.5
+SHARED_LIBS += streams1.2 # .0.5
+SHARED_LIBS += strigihtmlgui 1.2 # .0.5
+SHARED_LIBS += strigiqtdbusclient 1.2 # .0.5
+
+BUILD_DEPENDS =devel/cppunit \
+ devel/boost
+
+LIB_DEPENDS = archivers/bzip2 \
+ graphics/exiv2 \
+ graphics/ffmpeg \
+ sysutils/gamin \
+ textproc/clucene=2.3 \
textproc/libxml \
- x11/qt4 \
- x11/dbus \
- graphics/exiv2
-
-WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender bz2 c clucene=1 dbus-1 exiv2 \
- fontconfig freetype glib-2.0 gthread-2.0 lib/qt4/QtCore \
- lib/qt4/QtDBus lib/qt4/QtGui m png pthread stdc++ xml2 z
${MODLIBICONV_WANTLIB}
-
-MODULES += devel/cmake converters/libiconv
-CONFIGURE_STYLE = cmake
-SEPARATE_BUILD = Yes
+ x11/dbus
+
+WANTLIB = lib/qt4/QtDBus lib/qt4/QtGui
+WANTLIB += bz2 c clucene-core clucene-shared dbus-1 exiv2 fam m pthread
+WANTLIB += stdc++ xml2 z avcodec avformat avutil swscale
+
+MODULES = devel/cmake \
+ converters/libiconv \
+ x11/qt4
+
+# Not ported
+CONFIGURE_ARGS = -DENABLE_LOG4CXX:Bool=No
-CONFIGURE_ARGS += -DHyperEstraier_FOUND:BOOL=0
+# Depends on Java
+CONFIGURE_ARGS += -DENABLE_REGENERATEXSD:Bool=No
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/databases/strigi/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo18 Jun 2010 15:09:41 - 1.6
+++ distinfo13 Nov 2012 21:04:57 -
@@ -1,5 +1,2 @@
-MD5 (strigi-0.7.2.tar.bz2) = ygm6F2zz/+mvzk2S84+ahQ==
-RMD160 (strigi-0.7.2.tar.bz2) = dJcZUzX3bzCSL1xqyq44PhRLM8c=
-SHA1 (strigi-0.7.2.tar.bz2) = tMFHLvBoU2rPnFxMjwM6l/nGn58=
-SHA256 (strigi-0.7.2.tar.bz2) = HKQhu+Qg0YObvmv+fEtSoFWQqben7ad5JLVUyY5gKrg=
-SIZE (strigi-0.7.2.tar.bz2) = 936320
+SHA256 (strigi-0.7.7pl1.tar.gz) = eLltb5+Jw4xu5iBdYv4MPyjYyS0gRCAZOvFK8Rq7IaM=
+SIZE (strigi-0.7.7pl1.tar.gz) = 908466
Index: patches/patch-cmake_FindQt4_cmake
===
RCS file: patches/patch-cmake_FindQt4_cmake
diff -N patches/patch-cmake_FindQt4_cmake
--- patches/patch-cmake_FindQt4_cmake 24 Oct 2007 22:49:38 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,189 +0,0 @@
-$OpenBSD: patch-cmake_FindQt4_cmake,v 1.2 2007/10/24 22:49:38 espie Exp $
cmake/FindQt4.cmake.orig Mon Jul 16 13:26:59 2007
-+++ cmake/FindQt4.cmakeThu Oct 25 00:10:55 2007
-@@ -184,6 +184,19 @@
- # Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
- # See Copyright.txt or
Re: scribus displays strangely and emits errors
On Mon, 12 Nov 2012 14:09:51 -0800 Tim Howe th...@bendtel.net wrote: On a fresh 5.2 install after installing scribus from the pre-compiled package it displays in an unusable way and emits errors like so: libpng warning: Duplicate iCCP chunk libpng warning: Duplicate iCCP chunk QNativeImage: Unable to attach to shared memory segment. X Error: BadDrawable (invalid Pixmap or Window parameter) 9 Major opcode: 62 (X_CopyArea) Resource id: 0x0 X Error: BadDrawable (invalid Pixmap or Window parameter) 9 Major opcode: 62 (X_CopyArea) Resource id: 0x0 X Error: BadDrawable (invalid Pixmap or Window parameter) 9 Major opcode: 62 (X_CopyArea) Resource id: 0x0 X Error: BadDrawable (invalid Pixmap or Window parameter) 9 Major opcode: 62 (X_CopyArea) Resource id: 0x0 X Error: BadDrawable (invalid Pixmap or Window parameter) 9 Major opcode: 62 (X_CopyArea) Resource id: 0x0 QNativeImage: Unable to attach to shared memory segment. X Error: BadDrawable (invalid Pixmap or Window parameter) 9 Major opcode: 62 (X_CopyArea) Resource id: 0x0 X Error: BadDrawable (invalid Pixmap or Window parameter) 9 Major opcode: 62 (X_CopyArea) Resource id: 0x0 X Error: BadDrawable (invalid Pixmap or Window parameter) 9 Major opcode: 62 (X_CopyArea) Resource id: 0x0 X Error: BadDrawable (invalid Pixmap or Window parameter) 9 Major opcode: 62 (X_CopyArea) Resource id: 0x0 X Error: BadDrawable (invalid Pixmap or Window parameter) 9 Major opcode: 62 (X_CopyArea) Resource id: 0x0 Chris Cappuccio pointed out to me that it is probably a resource issue. It then occurred that it only works fine when PostgreSQL isn't running. I made the sysctl changes as specified in the PostgreSQL pkg-readme and that appears to have resolved that issue. --TimH
Re: kde4 integration diffs: databases/strigi + graphics/dcmtk
On 2012/11/13 15:38, Amit Kulkarni wrote:
+DISTNAME = strigi-0.7.7pl1
+MASTER_SITES = ftp://3ps.if.ua/pub/OpenBSD/distfiles/ \
+ http://malcolm.ecentrum.hu/distfiles/ \
+ http://spacehopper.org/mirrors/ \
+ http://www.ohvost.ru/dnl/kde/src/
Where does this distfile come from? If it's packaged from a
repository checkout, please add a comment showing where it was from.
-SHARED_LIBS += searchclient 1.0 # .0.5
+SHARED_LIBS += searchclient 1.2 # .0.5
(etc)
these ones should either be 1.0, 1.1 or 2.0 depending on what changed,
if in doubt then use 2.0.
http://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs
dcmtk, only skimmed it, not feeling clever enough to work out post-configure
atm ;)
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/PFRAG.shared 13 Nov 2012 21:21:32 -
@@ -0,0 +1,13 @@
+@comment $OpenBSD$
+@lib lib/libdcmdata.so.${LIBdcmdata_VERSION}
+@lib lib/libdcmimage.so.${LIBdcmimage_VERSION}
+@lib lib/libdcmimgle.so.${LIBdcmimgle_VERSION}
+@lib lib/libdcmjpeg.so.${LIBdcmjpeg_VERSION}
+@lib lib/libdcmnet.so.${LIBdcmnet_VERSION}
+@lib lib/libdcmpstat.so.${LIBdcmpstat_VERSION}
+@lib lib/libdcmqrdb.so.${LIBdcmqrdb_VERSION}
+@lib lib/libdcmsign.so.${LIBdcmsign_VERSION}
+@lib lib/libdcmsr.so.${LIBdcmsr_VERSION}
+@lib lib/libdcmtls.so.${LIBdcmtls_VERSION}
+@lib lib/libdcmwlm.so.${LIBdcmwlm_VERSION}
+@lib lib/libofstd.so.${LIBofstd_VERSION}
These can just all get merged into PLIST these days.
Re: scribus displays strangely and emits errors
Tim Howe [th...@bendtel.net] wrote: Chris Cappuccio pointed out to me that it is probably a resource issue. It then occurred that it only works fine when PostgreSQL isn't running. I made the sysctl changes as specified in the PostgreSQL pkg-readme and that appears to have resolved that issue. ipcs can be helpful in this regard, when anything crashes and doesn't clean up its resources, or needs resources in excess of what is default (which can be the case with postgresql and large databases)
Re: result of modern kde4 integration into cvs build
On 11/13/12 19:46, Nigel Taylor wrote:
On 11/13/12 12:53, Pascal Stumpf wrote:
On Mon, 12 Nov 2012 22:11:44 +, Nigel Taylor wrote:
On 11/12/12 19:48, Stuart Henderson wrote:
big cc list trimmed, everyone interested in this should be on ports@,
right?
On 2012/11/12 13:25, Amit Kulkarni wrote:
cd /usr/ports/openbsd-wip git pull
mv /usr/ports/databases/strigi/usr/ports/databases/strigi.old
mv /usr/ports/multimedia/phonon /usr/ports/multimedia/phonon.old
these two aren't linked to the build yet, so these might as well
just get updated in cvs.
mv /usr/ports/graphics/dcmtk /usr/ports/graphics/dcmtk.old
mv /usr/ports/graphics/opencv /usr/ports/graphics/opencv.old
nothing depends on these, if they work ok then these should be fairly
straightforward to update too.
mv /usr/ports/graphics/liblqr /usr/ports/graphics/liblqr.old
does liquid-rescale work OK with the newer version?
mv /usr/ports/lang/g77/usr/ports/lang/g77.old
what's the status of this? have the various ports in-tree
which depend on g77 been tested with it?
So how about CVS diffs for these so they can be tested/committed?
openbsd-wip is fine as a shared tree for development work, but
when it comes time to try and get these things in, the usual
process with sending out diffs is the way forward (in manageable
pieces please, i.e. unless a bunch of things must all be updated
at the same time to avoid breakage like the rdf things then
work on getting one or two in, then move on to the next things;
a flood of diffs all at once will usually just get ignored as
people are too overloaded ;)
g77 diff was posted to ports@ before 22/09, then put into openbsd-wip so
it wasn't lost, waiting on comments. A new diff is attached, because it
includes additional changes since the original post to ports@, includes
the change for mip64el also posted to ports@ 22/10.
I have been building ports with this in place both for amd64 and i386.
It is only a fix for runtime /regress dependencies and being able to run
regression tests.
As far as kde4 is concerned as long as libf2c is installed at runtime
the existing g77 in the ports tree should work, apart from mips64el.
Index: Makefile
===
RCS file: /home/cvs/ports/lang/g77/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile1 Sep 2012 00:00:32 - 1.18
+++ Makefile10 Nov 2012 11:22:11 -
@@ -1,16 +1,17 @@
# $OpenBSD: Makefile,v 1.18 2012/09/01 00:00:32 pascal Exp $
-NOT_FOR_ARCHS =${GCC2_ARCHS}
+ONLY_FOR_ARCHS = ${GCC4_ARCHS}
V =3.3.5
PKGNAME = g77-$V
-REVISION = 5
+REVISION = 6
EPOCH =0
DISTFILES =g77-openbsd.tgz
CONFIG = ${MACHINE_ARCH}-unknown-openbsd${OSREV}
SUBST_VARS += CONFIG V
SYSV = 4.2.1
+SYSLIBPATH =`cc -v 21| sed -n -e
'/gcc-lib/s%^[^/]*\(/.*\)/[^/]*%\1%p'`
COMMENT = GNU fortran 77 compiler
CATEGORIES = lang math
@@ -21,6 +22,10 @@ PERMIT_PACKAGE_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
PERMIT_PACKAGE_FTP = Yes
+RUN_DEPENDS = devel/libf2c
+REGRESS_DEPENDS = devel/dejagnu \
+ devel/libf2c
+
WRKDIST = ${WRKDIR}/g77
CONFIGURE_SCRIPT = ${WRKDIST}/gcc/configure
@@ -67,12 +72,16 @@ ALL_TARGET =all doc
INSTALL_TARGET = install-common f77.install-info f77.install-normal
post-install:
- ln -sf /usr/lib/gcc-lib/${CONFIG}/${SYSV}/libgcc.a
${PREFIX}/lib/gcc-lib/${CONFIG}/$V/libgcc.a
- ln -s /usr/lib/gcc-lib/${CONFIG}/${SYSV}/cc1
${PREFIX}/lib/gcc-lib/${CONFIG}/$V/cc1
+ ln -sf ${SYSLIBPATH}/libgcc.a
${PREFIX}/lib/gcc-lib/${CONFIG}/$V/libgcc.a
+ ln -s ${SYSLIBPATH}/cc1 ${PREFIX}/lib/gcc-lib/${CONFIG}/$V/cc1
${INSTALL_MAN} ${WRKBUILD}/f/g77.1 ${PREFIX}/man/man1/g77.1
cd ${PREFIX}/man/man1 ln -f g77.1 f77.1
cd ${PREFIX}/bin ln -f g77 f77
WANTLIB = c iberty
+
+pre-regress:
+ ln -sf ${SYSLIBPATH}/libgcc.a ${WRKBUILD}/libgcc.a
+ ln -s ${SYSLIBPATH}/cc1 ${WRKBUILD}/cc1
.include bsd.port.mk
Index: distinfo
===
RCS file: /home/cvs/ports/lang/g77/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo24 May 2010 22:43:57 - 1.1.1.1
+++ distinfo9 Nov 2012 14:53:08 -
@@ -1,5 +1,2 @@
-MD5 (g77-openbsd.tgz) = RkFBHVXXRFefnZJtD7CzNw==
-RMD160 (g77-openbsd.tgz) = FxIFG017fw7XNFqBbZ5u62FMXjc=
-SHA1 (g77-openbsd.tgz) = c5SUxU68KXKPI9JuX1zP3tginiU=
SHA256 (g77-openbsd.tgz) = QMSj29yw1B9Oa8OwyliN72S3RF1OPXT8wDG1X+KJhEo=
SIZE (g77-openbsd.tgz) = 14445321
Index: patches/patch-gcc_config_gcc
Re: result of modern kde4 integration into cvs build
On Wed, 14 Nov 2012 00:40:13 +0300 Vadim Zhukov wrote: So what you want is not as easy as porting Konqueror/Embedded. Of course, KJS should be fixed, but there are more critical tasks now, sorry. As I say, I'm pretty sure it would only be a browser and not a file manager like full blown konqueror anyway, so I was really just highlighting it to anyone who may only want the konqueror browser. Thanks. Kc
Re: kde4 integration diffs: databases/strigi + graphics/dcmtk
On Tue, 13 Nov 2012 22:41:06 +
Stuart Henderson s...@spacehopper.org wrote:
On 2012/11/13 15:38, Amit Kulkarni wrote:
+DISTNAME = strigi-0.7.7pl1
+MASTER_SITES = ftp://3ps.if.ua/pub/OpenBSD/distfiles/ \
+ http://malcolm.ecentrum.hu/distfiles/ \
+ http://spacehopper.org/mirrors/ \
+ http://www.ohvost.ru/dnl/kde/src/
Where does this distfile come from? If it's packaged from a
repository checkout, please add a comment showing where it was from.
I have added a comment, if more clarification is needed it can supplied by
Vadim, who actually did the bundling.
I have also fixed the SHARED_LIBS numbering for strigi and moving PFRAG.shared
to PLIST for graphics/dcmtk
attached is v2 of diffs.
? strigi_v2.diff
Index: Makefile
===
RCS file: /cvs/ports/databases/strigi/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile29 Mar 2012 13:38:13 - 1.14
+++ Makefile13 Nov 2012 23:31:23 -
@@ -1,45 +1,55 @@
-# $OpenBSD: Makefile,v 1.14 2012/03/29 13:38:13 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2011/07/07 01:06:59 ajacoutot Exp $
-SHARED_ONLY = Yes
COMMENT = document indexer
CATEGORIES = databases devel textproc sysutils
-HOMEPAGE = http://strigi.sourceforge.net
-DISTNAME = strigi-0.7.2
+HOMEPAGE = https://projects.kde.org/projects/kdesupport/strigi/
-REVISION = 0
+# Distfile is handrolled from strigi's various sub-modules and their git repos
+# @ quickgit.kde.org since upstream doesn't update version
+DISTNAME = strigi-0.7.7pl1
+SHARED_ONLY = Yes
-EXTRACT_SUFX = .tar.bz2
-MASTER_SITES = http://www.vandenoever.info/software/strigi/ \
- http://spacehopper.org/mirrors/
+MASTER_SITES = ftp://3ps.if.ua/pub/OpenBSD/distfiles/ \
+ http://malcolm.ecentrum.hu/distfiles/ \
+ http://spacehopper.org/mirrors/ \
+ http://www.ohvost.ru/dnl/kde/src/
# LGPLv2+
-PERMIT_PACKAGE_CDROM = Yes
-PERMIT_PACKAGE_FTP = Yes
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
-PERMIT_DISTFILES_FTP = Yes
-
-SHARED_LIBS += searchclient 1.0 # .0.5
-SHARED_LIBS += streamanalyzer 1.0 # .0.5
-SHARED_LIBS += streams1.0 # .0.5
-SHARED_LIBS += strigihtmlgui 1.0 # .0.5
-SHARED_LIBS += strigiqtdbusclient 1.0 # .0.5
+PERMIT_DISTFILES_FTP = Yes
-LIB_DEPENDS = clucene-core-=0.9.21:textproc/clucene \
- archivers/bzip2 \
+SHARED_LIBS += searchclient 2.0
+SHARED_LIBS += streamanalyzer 2.0
+SHARED_LIBS += streams2.0
+SHARED_LIBS += strigihtmlgui 2.0
+SHARED_LIBS += strigiqtdbusclient 2.0
+
+BUILD_DEPENDS =devel/cppunit \
+ devel/boost
+
+LIB_DEPENDS = archivers/bzip2 \
+ graphics/exiv2 \
+ graphics/ffmpeg \
+ sysutils/gamin \
+ textproc/clucene=2.3 \
textproc/libxml \
- x11/qt4 \
- x11/dbus \
- graphics/exiv2
-
-WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender bz2 c clucene=1 dbus-1 exiv2 \
- fontconfig freetype glib-2.0 gthread-2.0 lib/qt4/QtCore \
- lib/qt4/QtDBus lib/qt4/QtGui m png pthread stdc++ xml2 z
${MODLIBICONV_WANTLIB}
-
-MODULES += devel/cmake converters/libiconv
-CONFIGURE_STYLE = cmake
-SEPARATE_BUILD = Yes
+ x11/dbus
+
+WANTLIB = lib/qt4/QtDBus lib/qt4/QtGui
+WANTLIB += bz2 c clucene-core clucene-shared dbus-1 exiv2 fam m pthread
+WANTLIB += stdc++ xml2 z avcodec avformat avutil swscale
+
+MODULES = devel/cmake \
+ converters/libiconv \
+ x11/qt4
+
+# Not ported
+CONFIGURE_ARGS = -DENABLE_LOG4CXX:Bool=No
-CONFIGURE_ARGS += -DHyperEstraier_FOUND:BOOL=0
+# Depends on Java
+CONFIGURE_ARGS += -DENABLE_REGENERATEXSD:Bool=No
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/databases/strigi/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo18 Jun 2010 15:09:41 - 1.6
+++ distinfo13 Nov 2012 23:31:23 -
@@ -1,5 +1,2 @@
-MD5 (strigi-0.7.2.tar.bz2) = ygm6F2zz/+mvzk2S84+ahQ==
-RMD160 (strigi-0.7.2.tar.bz2) = dJcZUzX3bzCSL1xqyq44PhRLM8c=
-SHA1 (strigi-0.7.2.tar.bz2) = tMFHLvBoU2rPnFxMjwM6l/nGn58=
-SHA256 (strigi-0.7.2.tar.bz2) = HKQhu+Qg0YObvmv+fEtSoFWQqben7ad5JLVUyY5gKrg=
-SIZE (strigi-0.7.2.tar.bz2) = 936320
+SHA256 (strigi-0.7.7pl1.tar.gz) = eLltb5+Jw4xu5iBdYv4MPyjYyS0gRCAZOvFK8Rq7IaM=
+SIZE (strigi-0.7.7pl1.tar.gz) = 908466
Index: patches/patch-cmake_FindQt4_cmake
===
RCS file: patches/patch-cmake_FindQt4_cmake
diff -N patches/patch-cmake_FindQt4_cmake
--- patches/patch-cmake_FindQt4_cmake 24 Oct 2007 22:49:38
Re: scribus displays strangely and emits errors
On Tue, 13 Nov 2012 14:55:15 -0800 Chris Cappuccio ch...@nmedia.net wrote: Tim Howe [th...@bendtel.net] wrote: Chris Cappuccio pointed out to me that it is probably a resource issue. It then occurred that it only works fine when PostgreSQL isn't running. I made the sysctl changes as specified in the PostgreSQL pkg-readme and that appears to have resolved that issue. ipcs can be helpful in this regard, when anything crashes and doesn't clean up its resources, or needs resources in excess of what is default (which can be the case with postgresql and large databases) Well, I should note that Pg was running, but it still has a default configuration and (at the time) no databases. --TimH
UPDATE lang/g77 left overs from kde4
Attached is the diff for left over updates after the commit for kde4.
This needs confirming that it works on mips platforms. I don't have any
mips.
Index: Makefile
===
RCS file: /home/cvs/ports/lang/g77/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile13 Nov 2012 22:34:04 - 1.19
+++ Makefile14 Nov 2012 00:10:16 -
@@ -4,7 +4,7 @@ NOT_FOR_ARCHS = ${GCC2_ARCHS}
V =3.3.5
PKGNAME = g77-$V
-REVISION = 6
+REVISION = 7
EPOCH =0
DISTFILES =g77-openbsd.tgz
Index: patches/patch-gcc_config_gcc
===
RCS file: /home/cvs/ports/lang/g77/patches/patch-gcc_config_gcc,v
retrieving revision 1.1
diff -u -p -r1.1 patch-gcc_config_gcc
--- patches/patch-gcc_config_gcc1 Sep 2012 00:00:32 - 1.1
+++ patches/patch-gcc_config_gcc14 Nov 2012 00:09:36 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-gcc_config_gcc,v 1.1 2012/09/01 00:00:32 pascal Exp $
--- gcc/config.gcc.origSat May 22 18:18:42 2010
-+++ gcc/config.gcc Fri Aug 31 18:22:31 2012
gcc/config.gcc Tue Nov 13 13:52:33 2012
@@ -1184,6 +1184,7 @@ i[34567]86-*-openbsd*)
gnu_ld=yes
;;
@@ -9,16 +9,15 @@ $OpenBSD: patch-gcc_config_gcc,v 1.1 201
tm_file=i386/biarch64.h i386/i386.h i386/unix.h i386/att.h dbxelf.h
elfos.h openbsd.h openbsd-libpthread.h i386/x86-64.h i386/openbsd64.h
tm_file=${tm_file} exec-stack.h
tmake_file=t-libc-ok t-openbsd i386/t-openbsd
-@@ -1935,7 +1936,7 @@ mips*-*-linux*) # Linux MIPS,
either endian.
- tmake_file=t-slibgcc-elf-ver t-linux mips/t-linux
+@@ -1936,6 +1937,7 @@ mips*-*-linux*) # Linux MIPS,
either endian.
;;
mips*-*-openbsd*)
-- target_cpu_default=MASK_GAS|MASK_ABICALLS
-+ target_cpu_default=MASK_GAS|MASK_ABICALLS PIE_DEFAULT=1
+ target_cpu_default=MASK_GAS|MASK_ABICALLS
++ tm_defines=${tm_defines} PIE_DEFAULT=1
tm_file=elfos.h ${tm_file}
case $machine in
mips64*-*)
-@@ -2460,6 +2461,7 @@ sparc-*-openbsd*)
+@@ -2460,6 +2462,7 @@ sparc-*-openbsd*)
use_collect2=yes
;;
sparc64-*-openbsd*)
What happened with the emacs24 port?
Hello, I just wonder what happened with the Emacs24 port. The last mails in the thread about the port pretty much gave OK to submit it... and I have not seen any submission yet, and no further discussion either. Lasse
Re: kde4 integration diffs: databases/strigi + graphics/dcmtk
14.11.2012 2:41 пользователь Stuart Henderson s...@spacehopper.org
написал:
On 2012/11/13 15:38, Amit Kulkarni wrote:
+DISTNAME = strigi-0.7.7pl1
+MASTER_SITES = ftp://3ps.if.ua/pub/OpenBSD/distfiles/ \
+ http://malcolm.ecentrum.hu/distfiles/ \
+ http://spacehopper.org/mirrors/ \
+ http://www.ohvost.ru/dnl/kde/src/
Where does this distfile come from? If it's packaged from a
repository checkout, please add a comment showing where it was from.
ohvost.ru is my server which is offline. malcolm.ecentrum.hu is the build
server I have access to, thanks to Daniel Levai.
-SHARED_LIBS += searchclient 1.0 # .0.5
+SHARED_LIBS += searchclient 1.2 # .0.5
(etc)
these ones should either be 1.0, 1.1 or 2.0 depending on what changed,
if in doubt then use 2.0.
http://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs
Yep. There were actually two bumps made in WIP repo, thus 1.2 version. I
hoped this is not critical. :)
dcmtk, only skimmed it, not feeling clever enough to work out
post-configure atm ;)
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/PFRAG.shared 13 Nov 2012 21:21:32 -
@@ -0,0 +1,13 @@
+@comment $OpenBSD$
+@lib lib/libdcmdata.so.${LIBdcmdata_VERSION}
+@lib lib/libdcmimage.so.${LIBdcmimage_VERSION}
+@lib lib/libdcmimgle.so.${LIBdcmimgle_VERSION}
+@lib lib/libdcmjpeg.so.${LIBdcmjpeg_VERSION}
+@lib lib/libdcmnet.so.${LIBdcmnet_VERSION}
+@lib lib/libdcmpstat.so.${LIBdcmpstat_VERSION}
+@lib lib/libdcmqrdb.so.${LIBdcmqrdb_VERSION}
+@lib lib/libdcmsign.so.${LIBdcmsign_VERSION}
+@lib lib/libdcmsr.so.${LIBdcmsr_VERSION}
+@lib lib/libdcmtls.so.${LIBdcmtls_VERSION}
+@lib lib/libdcmwlm.so.${LIBdcmwlm_VERSION}
+@lib lib/libofstd.so.${LIBofstd_VERSION}
These can just all get merged into PLIST these days.
