Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 108775 Details for
Bug 114327
New better tasting kde-base/qtjava and kde-base/kdejava ebuilds (3.4.3 and 3.5)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
generation-2 java revbump patch for kdejava 3.5.6
kdejava-3.5.6-r1.ebuild.patch (text/plain), 2.10 KB, created by
Vlastimil Babka (Caster) (RETIRED)
on 2007-01-31 16:53:12 UTC
(
hide
)
Description:
generation-2 java revbump patch for kdejava 3.5.6
Filename:
MIME Type:
Creator:
Vlastimil Babka (Caster) (RETIRED)
Created:
2007-01-31 16:53:12 UTC
Size:
2.10 KB
patch
obsolete
>--- kdejava-3.5.6.ebuild 2007-01-31 16:16:45.000000000 +0100 >+++ kdejava-3.5.6-r1.ebuild 2007-01-31 17:28:25.000000000 +0100 >@@ -8,7 +8,7 @@ > KM_MAKEFILESREV=1 > MAXKDEVER=$PV > KM_DEPRANGE="$PV $MAXKDEVER" >-inherit kde-meta >+inherit java-pkg-2 kde-meta > > DESCRIPTION="KDE java bindings" > KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" >@@ -16,31 +16,43 @@ > COMMONDEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kwin) > $(deprange-dual $PV $MAXKDEVER kde-base/kcontrol) > $(deprange $PV $MAXKDEVER kde-base/qtjava)" >-DEPEND="virtual/jdk $COMMONDEPEND" >-RDEPEND="virtual/jre $COMMONDEPEND" >+DEPEND=">=virtual/jdk-1.4 $COMMONDEPEND" >+RDEPEND=">=virtual/jre-1.4 $COMMONDEPEND" > OLDDEPEND="~kde-base/kwin-$PV ~kde-base/kcontrol-$PV ~kde-base/qtjava-$PV virtual/jdk" > >-PATCHES="$FILESDIR/no-gtk-glib-check.diff $FILESDIR/kdejava-3.4.0_rc1-classpath.diff" >- >+PATCHES="${FILESDIR}/no-gtk-glib-check.diff >+ ${FILESDIR}/${PN}-${SLOT}-javacflags.patch" > > # Probably missing other kdebase, kdepim etc deps > # Needs to be compiled with just kdelibs installed to make sure > >-# Someone who knows about java-in-gentoo should look at this and the >-# other java kdebindings, and fix the stupid thing >+# both eclasses define pkg_setup >+pkg_setup() { >+ kde_pkg_setup >+ java-pkg-2_pkg_setup >+} >+ > src_unpack() { > kde-meta_src_unpack > >- # $PREFIX-dependant, so don't go into the makefile tarballs >- cd $S/kdejava/koala/org/kde/koala >- for x in Makefile.am Makefile.in; do >- mv $x $x.orig >- sed -e "s:_CLASSPATH_:$(java-config -p qtjava):" $x.orig > $x >- rm $x.orig >- done >+ local cp="$(java-pkg_getjars qtjava-${SLOT})" >+ local mf="${S}/kdejava/koala/org/kde/koala/Makefile.am" >+ sed -i -e "s#_CLASSPATH_#${cp}#" "${mf}" \ >+ || die "sed CLASSPATH failed" >+ sed -i -e "s#_JAVACFLAGS_#${JAVACFLAGS}#" "${mf}" \ >+ || die "sed JAVACFLAGS failed" > } > > src_compile() { >- myconf="$myconf --with-java=`java-config --jdk-home`" >+ myconf="${myconf} --with-java=${JDK_HOME}" > kde-meta_src_compile > } >+ >+src_install() { >+ kde-meta_src_install >+ >+ rm -rf ${D}/usr/kde/${SLOT}/lib/java >+ >+ java-pkg_dojar ${S}/${PN}/koala/koala.jar >+ java-pkg_regso "${D}/usr/kde/${SLOT}"/lib/*.so >+}
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 114327
:
73973
|
95961
|
108767
|
108768
|
108770
|
108771
|
108772
|
108773
| 108775