Merge branch 'master' of github.com:pisilinux/main

This commit is contained in:
Ertuğrul Erata
2018-08-17 18:54:30 +03:00
6 changed files with 16 additions and 9 deletions
+1 -1
View File
@@ -44,7 +44,7 @@
<Update release="5">
<Date>2018-08-16</Date>
<Version>1.9.9</Version>
<Comment>Rebuild.</Comment>
<Comment>Rebuild jdk7-2.6.14.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
@@ -40,7 +40,7 @@
<Update release="4">
<Date>2018-08-16</Date>
<Version>4.4.2_201502041700</Version>
<Comment>Rebuild New T.</Comment>
<Comment>Rebuild New T.jdk7-2.6.14</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
@@ -45,6 +45,13 @@
</Package>
<History>
<Update release="2">
<Date>2018-08-17</Date>
<Version>1.6.2</Version>
<Comment>Rebuild.</Comment>
<Name>Serdar Soytetir</Name>
<Email>kaptan@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2017-01-08</Date>
<Version>1.6.2</Version>
@@ -15,8 +15,8 @@ shelltools.export("LC_ALL", "C")
def setup():
shelltools.system('export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \
patches/openjdk7_nonreparenting-wm.diff\
patches/giflib_5.1.diff"')
patches/openjdk7_nonreparenting-wm.diff"')
#patches/giflib_5.1.diff
autotools.rawConfigure("\
--disable-tests \
@@ -24,14 +24,13 @@ def setup():
--with-parallel-jobs=%s \
--enable-nss \
--with-rhino \
--bindir=/usr/bin \
--disable-system-kerberos \
--disable-system-pcsc \
--disable-system-sctp \
--enable-bootstrap \
--with-ecj-jar=/usr/share/java/ecj.jar \
--with-jdk-home=/usr/lib/jvm/java-7-openjdk \
--with-pkgversion='PisiLinux build 7u_181.2.6.14' \
--with-pkgversion='PisiLinux build 7.u181_2.6.14' \
" % get.makeJOBS().replace("-j", ""))
def build():
@@ -39,10 +39,11 @@
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>libXcomposite-devel</Dependency>
<Dependency>chrpath</Dependency>
<Dependency>jre7-openjdk-headless</Dependency>
<!--<Dependency>pulseaudio-libs-devel</Dependency>--><!-- for bootstrap -->
</BuildDependencies>
<AdditionalFiles>
<AdditionalFile target="patches/giflib_5.1.diff">giflib_5.1.diff</AdditionalFile>
<!-- <AdditionalFile target="patches/giflib_5.1.diff">giflib_5.1.diff</AdditionalFile> -->
<AdditionalFile target="patches/fontconfig-paths.diff">fontconfig-paths.diff</AdditionalFile>
<AdditionalFile target="patches/openjdk7_nonreparenting-wm.diff">openjdk7_nonreparenting-wm.diff</AdditionalFile>
</AdditionalFiles>
@@ -303,7 +304,7 @@
<Update release="5">
<Date>2018-08-15</Date>
<Version>7u_181.2.6.14</Version>
<Comment>Release Bump</Comment>
<Comment>Rebuild.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
+1 -1
View File
@@ -43,7 +43,7 @@
<Update release="4">
<Date>2018-08-16</Date>
<Version>1.7.7.1</Version>
<Comment>Rebuild New T.</Comment>
<Comment>Rebuild New T.jdk7-2.6.14</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>