Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6924 from Rmys/master

Browse Source 
java8-openjdk:rebuild conflict
This commit is contained in:
Rmys
2019-06-18 01:58:40 +03:00
committed by GitHub
parent 7667644bd9 136812ec76
commit 02c7c844ac
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programming/language/java/java8-openjdk/actions.py
+1 -1
View File
@@ -89,7 +89,7 @@ def install():
for size in [16, 24, 32, 48]: for size in [16, 24, 32, 48]:
fullsize = "%dx%d" % ((size, ) * 2) fullsize = "%dx%d" % ((size, ) * 2)
pisitools.insinto("/usr/share/icons/hicolor/%s/apps/" % fullsize, "../openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon%d.png" % size, "java.png") pisitools.insinto("/usr/share/icons/hicolor/%s/apps/" % fullsize, "../openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon%d.png" % size, "java8.png")
#---- install jre8-openjdk-headless #---- install jre8-openjdk-headless
pisitools.insinto("%s/jre/" % jvmdir , "images/j2sdk-image/jre/lib") pisitools.insinto("%s/jre/" % jvmdir , "images/j2sdk-image/jre/lib")
programming/language/java/java8-openjdk/pspec.xml
+2 -2
View File
@@ -174,8 +174,8 @@
<Path fileType="doc">/usr/share/doc/openjdk</Path> <Path fileType="doc">/usr/share/doc/openjdk</Path>
<Path fileType="executable">/usr/bin/policytool_8</Path> <Path fileType="executable">/usr/bin/policytool_8</Path>
<Path fileType="data">/usr/share/icons/hicolor/</Path> <Path fileType="data">/usr/share/icons/hicolor/</Path>
<Path fileType="man">/usr/share/man/man1/policytool.1</Path> <Path fileType="man">/usr/share/man/man1/policytool.1_8</Path>
<Path fileType="man">/usr/share/man/ja/man1/policytool.1</Path> <Path fileType="man">/usr/share/man/ja/man1/policytool.1_8</Path>
<Path fileType="data">/usr/share/applications/policytool-jdk8.desktop</Path> <Path fileType="data">/usr/share/applications/policytool-jdk8.desktop</Path>
<Path fileType="executable">/usr/lib/jvm/java-8-openjdk/jre/bin/policytool</Path> <Path fileType="executable">/usr/lib/jvm/java-8-openjdk/jre/bin/policytool</Path>
<Path fileType="library">/usr/lib/jvm/java-8-openjdk/jre/lib/*/libjsoundalsa.so</Path> <Path fileType="library">/usr/lib/jvm/java-8-openjdk/jre/lib/*/libjsoundalsa.so</Path>