From owner-freebsd-java@FreeBSD.ORG Sat Oct 1 20:30:20 2005 Return-Path: X-Original-To: freebsd-java@hub.freebsd.org Delivered-To: freebsd-java@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EC1FB16A41F for ; Sat, 1 Oct 2005 20:30:20 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2237943D53 for ; Sat, 1 Oct 2005 20:30:20 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j91KUJDT077994 for ; Sat, 1 Oct 2005 20:30:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j91KUJ9Y077993; Sat, 1 Oct 2005 20:30:19 GMT (envelope-from gnats) Resent-Date: Sat, 1 Oct 2005 20:30:19 GMT Resent-Message-Id: <200510012030.j91KUJ9Y077993@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-java@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "\"Panagiotis Astithas\" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5192E16A41F for ; Sat, 1 Oct 2005 20:29:58 +0000 (GMT) (envelope-from past@ebs.gr) Received: from fly.ebs.gr (fly.ebs.gr [62.103.84.177]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6186143D46 for ; Sat, 1 Oct 2005 20:29:56 +0000 (GMT) (envelope-from past@ebs.gr) Received: from ebs.gr (root@hal.ebs.gr [10.1.1.2]) by fly.ebs.gr (8.12.9p1/8.12.9) with ESMTP id j91KTs9V075386 for ; Sat, 1 Oct 2005 23:29:54 +0300 (EEST) (envelope-from past@ebs.gr) Received: from ajax.ebs.gr (pptp.ebs.gr [10.1.1.200]) by ebs.gr (8.13.3/8.12.11) with ESMTP id j91KU2Z7036884 for ; Sat, 1 Oct 2005 23:30:05 +0300 (EEST) (envelope-from past@ebs.gr) Message-Id: <1128198585.0@ajax.ebs.gr> Date: Sat, 1 Oct 2005 23:29:45 +0300 From: "\"Panagiotis Astithas\" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.6 Cc: Subject: java/86804: [PATCH] Install a desktop icon for the java/jdk15 Control Panel X-BeenThere: freebsd-java@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting Java to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Oct 2005 20:30:21 -0000 >Number: 86804 >Category: java >Synopsis: [PATCH] Install a desktop icon for the java/jdk15 Control Panel >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-java >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Oct 01 20:30:19 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Panagiotis Astithas >Release: FreeBSD 6.0-BETA5 i386 >Organization: EBS Ltd. >Environment: System: FreeBSD 6.0-BETA5 #6: Fri Sep 30 22:09:56 EEST 2005 past@ajax.ebs.gr:/usr/obj/usr/src/sys/GENERIC >Description: When we install the jdk we don't fix the provided sun_java.desktop file, or install it in a suitable place for desktop environments to pick up. This patch is for java/jdk15 and creates the necessary menu entry for Gnome and KDE (although I haven't tested on the latter). >How-To-Repeat: Install java/jdk15. Observe that no desktop environment menu entries are created. >Fix: --- jdk15.patch begins here --- diff -ruN /usr/ports/java/jdk15/Makefile jdk15/Makefile --- /usr/ports/java/jdk15/Makefile Tue Sep 20 23:00:08 2005 +++ jdk15/Makefile Sat Oct 1 20:43:45 2005 @@ -43,6 +43,7 @@ MAKE_ENV+= BROWSER=mozilla .endif USE_ICONV= yes +USE_GNOME= desktopfileutils MAKE_ENV+= ALT_MOZILLA_HEADERS_PATH="${X11BASE}/include" .endif @@ -118,6 +119,9 @@ PLIST_FILES= jdk${JDK_VERSION}/jre/.systemPrefs/.system.lock \ jdk${JDK_VERSION}/jre/.systemPrefs/.systemRootModFile +.if !defined(WITHOUT_WEB) +PLIST_FILES+= share/applications/sun_java15.desktop +.endif PLIST_DIRS= jdk${JDK_VERSION}/jre/.systemPrefs .if (${ARCH} == amd64) @@ -225,6 +229,9 @@ ${REINPLACE_CMD} -e "s:-pthread:${PTHREAD_LIBS}:g" \ ${WRKSRC}/$${file}; \ done + ${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:g" \ + -e "s:%%JDK_VERSION%%:${JDK_VERSION}:g"\ + ${WRKSRC}/../../deploy/src/plugin/solaris/controlpanel/sun_java.desktop .if defined(WITH_LINUX_BOOTSTRAP) pre-build: @@ -284,9 +291,16 @@ ${MKDIR} ${PREFIX}/jdk${JDK_VERSION} cd ${JDKIMAGEDIR} && ${FIND} . \ | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION} +.if !defined(WITHOUT_WEB) + ${INSTALL_DATA} ${JDKIMAGEDIR}/jre/plugin/desktop/sun_java.desktop \ + ${PREFIX}/share/applications/sun_java15.desktop +.endif @${ECHO_MSG} "@unexec ${LOCALBASE}/bin/unregistervm ${PREFIX}/jdk${JDK_VERSION}/bin/java" >> ${TMPPLIST} @${FIND} -s ${JDKIMAGEDIR} -not -type d | \ ${SED} -ne 's#^${JDKIMAGEDIR}#jdk${JDK_VERSION}#p' >> ${TMPPLIST} +.if !defined(WITHOUT_WEB) + @${ECHO_MSG} '@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || /usr/bin/true' >> ${TMPPLIST} +.endif .if defined(WITH_DEBUG) cd ${JDKIMAGEDIR_G} && ${FIND} . \ | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION} @@ -296,10 +310,16 @@ @${FIND} -s -d ${PREFIX}/jdk${JDK_VERSION} -type d | \ ${SED} -ne 's#^${PREFIX}/#@dirrm #p' >> ${TMPPLIST} @${ECHO_MSG} "@exec ${LOCALBASE}/bin/registervm ${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}" >> ${TMPPLIST} +.if !defined(WITHOUT_WEB) + @${ECHO_MSG} '@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || /usr/bin/true' >> ${TMPPLIST} +.endif # XXX: put unregistervm into install script ? post-install: @${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}" +.if !defined(WITHOUT_WEB) + @-update-desktop-database +.endif @${SED} -e "s:%%JRE_HOME%%:${PREFIX}/jdk${JDK_VERSION}/jre:g" \ < ${FILESDIR}/pkg-install.in > ${PKGINSTALL} @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL diff -ruN /usr/ports/java/jdk15/files/patch-sun_java.desktop jdk15/files/patch-sun_java.desktop --- /usr/ports/java/jdk15/files/patch-sun_java.desktop Thu Jan 1 02:00:00 1970 +++ jdk15/files/patch-sun_java.desktop Sat Oct 1 20:26:16 2005 @@ -0,0 +1,13 @@ +--- ../../deploy/src/plugin/solaris/controlpanel/sun_java.desktop.orig Sat Oct 1 20:14:45 2005 ++++ ../../deploy/src/plugin/solaris/controlpanel/sun_java.desktop Sat Oct 1 20:16:12 2005 +@@ -1,8 +1,8 @@ + [Desktop Entry] + Name=Java + Comment=Java Control Panel +-Exec=INSTALL_DIR/JRE_NAME_VERSION/bin/ControlPanel +-Icon=INSTALL_DIR/JRE_NAME_VERSION/plugin/desktop/sun_java.png ++Exec=%%PREFIX%%/jdk%%JDK_VERSION%%/bin/ControlPanel ++Icon=%%PREFIX%%/jdk%%JDK_VERSION%%/jre/plugin/desktop/sun_java.png + Terminal=0 + Type=Application + Categories=Application;Settings;X-Sun-Supported;X-Red-Hat-Base; --- jdk15.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: