Jeremy Evans [2007-08-07, 14:26:22]:
> The attached patch fixes qtruby (part of kdebindings) so that it can
> be used out of the box. Currently, when building kdebindings, .0.0
> are added to the ruby .so extensions. Ruby assumes that .so
> extensions don't have numeric extensions, so it can't load the files
> until the appropriate files are renamed to remove .0.0. This patch
> removes the .0.0 extensions before building the package so that qtruby
> works out of the box.
>
> Tested on i386. Please test and commit.
Can you try this diff instead?
Marc, are you ok with this?
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/kde/bindings3/Makefile,v
retrieving revision 1.44
diff -u -r1.44 Makefile
--- Makefile 28 Jul 2007 14:08:08 -0000 1.44
+++ Makefile 8 Aug 2007 14:29:00 -0000
@@ -8,15 +8,11 @@
CATEGORIES= x11 x11/kde devel
VERSION= 3.5.7
DISTNAME= kdebindings-${VERSION}
-PKGNAME= ${DISTNAME}p0
+PKGNAME= ${DISTNAME}p1
MODKDE_VERSION= 3.5.7
SHARED_LIBS += kjsembed 2.0 # .1.0
SHARED_LIBS += smokeqt 4.0 # .3.2
SHARED_LIBS += smokekde 4.0 # .3.2
-# XXX
-#SHARED_LIBS += qtruby # .0.0
-#SHARED_LIBS += qui # .0.0
-#SHARED_LIBS += korundum # .0.0
LIB_DEPENDS=DCOP,kdecore.>=6,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjs,kmdi,knewstuff,kparts,kscript,kspell,kutils,kwalletclient::x11/kde/libs3
\
qui-mt::x11/qt3 \
Index: patches/patch-korundum_rubylib_korundum_Makefile_in
===================================================================
RCS file: patches/patch-korundum_rubylib_korundum_Makefile_in
diff -N patches/patch-korundum_rubylib_korundum_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-korundum_rubylib_korundum_Makefile_in 8 Aug 2007 14:29:00
-0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- korundum/rubylib/korundum/Makefile.in.orig Wed Aug 8 16:25:03 2007
++++ korundum/rubylib/korundum/Makefile.in Wed Aug 8 16:25:12 2007
+@@ -433,7 +433,7 @@ xparts_SUBDIR_included_TRUE = @xparts_SUBDIR_included_
+ INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby
$(all_includes) -I$(RUBY_ARCHDIR)
+ rubylibdir = $(RUBY_SITEARCHDIR)
+ rubylib_LTLIBRARIES = korundum.la
+-korundum_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0
++korundum_la_LDFLAGS = -module $(all_libraries) -avoid-version
+ #>- korundum_la_METASOURCES = AUTO
+ korundum_la_SOURCES = Korundum.cpp kdehandlers.cpp
+ korundum_la_LIBADD = $(LIB_KDE) $(top_builddir)/smoke/kde/libsmokekde.la
$(top_builddir)/qtruby/rubylib/qtruby/libqtrubyinternal.la
Index: patches/patch-qtruby_rubylib_designer_uilib_Makefile_in
===================================================================
RCS file:
/cvs/ports/x11/kde/bindings3/patches/patch-qtruby_rubylib_designer_uilib_Makefile_in,v
retrieving revision 1.6
diff -u -r1.6 patch-qtruby_rubylib_designer_uilib_Makefile_in
--- patches/patch-qtruby_rubylib_designer_uilib_Makefile_in 27 May 2007
16:49:44 -0000 1.6
+++ patches/patch-qtruby_rubylib_designer_uilib_Makefile_in 8 Aug 2007
14:29:00 -0000
@@ -1,11 +1,13 @@
$OpenBSD: patch-qtruby_rubylib_designer_uilib_Makefile_in,v 1.6 2007/05/27
16:49:44 espie Exp $
--- qtruby/rubylib/designer/uilib/Makefile.in.orig Mon May 14 13:28:58 2007
-+++ qtruby/rubylib/designer/uilib/Makefile.in Fri May 25 16:11:06 2007
-@@ -417,7 +417,7 @@ rubylibdir = $(RUBY_SITEARCHDIR)
++++ qtruby/rubylib/designer/uilib/Makefile.in Wed Aug 8 16:26:21 2007
+@@ -416,8 +416,8 @@ INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtrub
+ rubylibdir = $(RUBY_SITEARCHDIR)
rubylib_LTLIBRARIES = qui.la
qui_la_SOURCES = qui.cpp
- qui_la_LDFLAGS = -module -export-dynamic $(all_libraries) -version-info 0:0:0
+-qui_la_LDFLAGS = -module -export-dynamic $(all_libraries) -version-info 0:0:0
-qui_la_LIBADD = -lqui
++qui_la_LDFLAGS = -module -export-dynamic $(all_libraries) -avoid-version
+qui_la_LIBADD = -lqui-mt
#>- all: all-am
#>+ 1
Index: patches/patch-qtruby_rubylib_qtruby_Makefile_in
===================================================================
RCS file: patches/patch-qtruby_rubylib_qtruby_Makefile_in
diff -N patches/patch-qtruby_rubylib_qtruby_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-qtruby_rubylib_qtruby_Makefile_in 8 Aug 2007 14:29:00
-0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- qtruby/rubylib/qtruby/Makefile.in.orig Wed Aug 8 16:26:48 2007
++++ qtruby/rubylib/qtruby/Makefile.in Wed Aug 8 16:26:54 2007
+@@ -455,7 +455,7 @@ libqtrubyinternal_la_SOURCES = Qt.cpp handlers.cpp
+ rubylibdir = $(RUBY_SITEARCHDIR)
+ rubylib_LTLIBRARIES = qtruby.la
+ qtruby_la_SOURCES =
+-qtruby_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0
++qtruby_la_LDFLAGS = -module $(all_libraries) -avoid-version
+ qtruby_la_LIBADD = libqtrubyinternal.la $(LIB_QT)
$(top_builddir)/smoke/qt/libsmokeqt.la
+ SUBDIRS = lib
+ #>- all: all-recursive
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/kde/bindings3/pkg/PLIST,v
retrieving revision 1.14
diff -u -r1.14 PLIST
--- pkg/PLIST 1 Apr 2006 10:49:19 -0000 1.14
+++ pkg/PLIST 8 Aug 2007 14:29:00 -0000
@@ -70,11 +70,11 @@
lib/ruby/site_ruby/1.8/Qt.rb
lib/ruby/site_ruby/1.8/Qt/qtruby.rb
lib/ruby/site_ruby/1.8/${GNU_ARCH}-openbsd${OSREV}/korundum.la
-lib/ruby/site_ruby/1.8/${GNU_ARCH}-openbsd${OSREV}/korundum.so.0.0
+lib/ruby/site_ruby/1.8/${GNU_ARCH}-openbsd${OSREV}/korundum.so
lib/ruby/site_ruby/1.8/${GNU_ARCH}-openbsd${OSREV}/qtruby.la
-lib/ruby/site_ruby/1.8/${GNU_ARCH}-openbsd${OSREV}/qtruby.so.0.0
+lib/ruby/site_ruby/1.8/${GNU_ARCH}-openbsd${OSREV}/qtruby.so
lib/ruby/site_ruby/1.8/${GNU_ARCH}-openbsd${OSREV}/qui.la
-lib/ruby/site_ruby/1.8/${GNU_ARCH}-openbsd${OSREV}/qui.so.0.0
+lib/ruby/site_ruby/1.8/${GNU_ARCH}-openbsd${OSREV}/qui.so
@man man/man1/kjscmd.1
share/applications/kde/kjscmd.desktop
share/applnk/
