diff options
author | Eric Hameleers <alien@slackware.com> | 2013-11-02 16:02:36 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2013-11-02 16:02:36 +0000 |
commit | 8c3c82c9383913781765b5e6a1b6182afe5cd2b7 (patch) | |
tree | b34b12bc6975278038f14647864afa0221683448 /libreoffice | |
parent | 1893662c5d5d576f6a3b5d1bdde8b3b1ac9b6dea (diff) | |
download | asb-8c3c82c9383913781765b5e6a1b6182afe5cd2b7.tar.gz asb-8c3c82c9383913781765b5e6a1b6182afe5cd2b7.tar.xz |
Move patches to a separate subdirectory
Diffstat (limited to 'libreoffice')
-rwxr-xr-x | libreoffice/build/libreoffice.SlackBuild | 5 | ||||
-rwxr-xr-x | libreoffice/build/libreoffice33.SlackBuild | 7 | ||||
-rwxr-xr-x | libreoffice/build/libreoffice36.SlackBuild | 13 | ||||
-rwxr-xr-x | libreoffice/build/libreoffice41.SlackBuild | 5 | ||||
-rwxr-xr-x | libreoffice/build/libreoffice42.SlackBuild | 5 | ||||
-rwxr-xr-x | libreoffice/build/libreoffice43.SlackBuild | 5 |
6 files changed, 17 insertions, 23 deletions
diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild index 96e09156..41e84ab2 100755 --- a/libreoffice/build/libreoffice.SlackBuild +++ b/libreoffice/build/libreoffice.SlackBuild @@ -737,7 +737,7 @@ echo Building ... ## Apply our own (borrowed) patches. #touch $OUTPUT/patch-$PRGNAM.log -#cat $SRCDIR/libreoffice.boost_1.53.patch | patch -p1 --verbose \ +#cat $SRCDIR/patches/libreoffice.boost_1.53.patch | patch -p1 --verbose \ # 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log if [ -z "$SRCURL[0]" ]; then @@ -1234,8 +1234,7 @@ mkdir -p $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER} cp -a $DOCS $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER} || true cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/$PRGNAM.SlackBuild #cat $SRCDIR/Slackware.conf.in > $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/Slackware.conf.in -mkdir -p $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/patches -cp $SRCDIR/*.patch $SRCDIR/*.diff $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/patches/ || true +cp -ia $SRCDIR/patches $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/ || true chown -R root:root $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER} find $PKG/usr/doc -type f -exec chmod 644 {} \; diff --git a/libreoffice/build/libreoffice33.SlackBuild b/libreoffice/build/libreoffice33.SlackBuild index 86137878..224f9974 100755 --- a/libreoffice/build/libreoffice33.SlackBuild +++ b/libreoffice/build/libreoffice33.SlackBuild @@ -639,14 +639,14 @@ cd ${PRGNAM}-build-${VERSION}${SUBVER} # Replace a "SlacwkareOnly" patch that fails to apply, thereby preventing # all subsequent patching to be aborted: -cp $SRCDIR/scp2-user-config-ooo3.diff patches/dev300/ +cp $SRCDIR/patches/scp2-user-config-ooo3.diff patches/dev300/ # Disable this diff to prevent error in 32-bit compilation of 'sw' # ( undefined reference to `ixion::formula_lexer::swap_tokens ): sed -i -e 's/^fields-table-formula.diff.*/#&/' patches/dev300/apply # Add a patch to make the presenter console compile: -cp $SRCDIR/libreoffice.presenter.diff patches/hotfixes/ +cp $SRCDIR/patches/libreoffice.presenter.diff patches/hotfixes/ chown -R root:root . chmod -R u+w,go+r-w,a+X-s . @@ -942,8 +942,7 @@ mkdir -p $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION || true cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION/$PRGNAM.SlackBuild cat $SRCDIR/Slackware.conf.in.33 > $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION/Slackware.conf.in -mkdir -p $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION/patches -cp $SRCDIR/*.patch $SRCDIR/*.diff $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION/patches/ || true +cp -a $SRCDIR/patches $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION/ || true chown -R root:root $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION find $PKG/usr/doc -type f -exec chmod 644 {} \; diff --git a/libreoffice/build/libreoffice36.SlackBuild b/libreoffice/build/libreoffice36.SlackBuild index 5af9f721..db298d52 100755 --- a/libreoffice/build/libreoffice36.SlackBuild +++ b/libreoffice/build/libreoffice36.SlackBuild @@ -772,19 +772,19 @@ echo Building ... touch $OUTPUT/patch-$PRGNAM.log ## Fix compilation of hsqldb using java 1.7: -#cat $SRCDIR/hsqldb.jdk7.patch | patch -p1 --verbose \ +#cat $SRCDIR/patches/hsqldb.jdk7.patch | patch -p1 --verbose \ # 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log ## Fix building on armv7hl: -#cat $SRCDIR/libreoffice.gcc3_linux_arm.patch | patch -p1 --verbose \ +#cat $SRCDIR/patches/libreoffice.gcc3_linux_arm.patch | patch -p1 --verbose \ # 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log ## Fix general input/output error on save/open password-protected file: -#cat $SRCDIR/libreoffice.nss_init.patch | patch -p1 --verbose \ +#cat $SRCDIR/patches/libreoffice.nss_init.patch | patch -p1 --verbose \ # 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log -#cat $SRCDIR/libreoffice.mozprofile.patch | patch -p1 --verbose \ +#cat $SRCDIR/patches/libreoffice.mozprofile.patch | patch -p1 --verbose \ # 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log ## LO would not start on secondary monitor (hopefully fixed in LO 3.5.4), ## see also https://bugs.freedesktop.org/show_bug.cgi?id=49365 : -#cat $SRCDIR/libreoffice.multimonitor.patch | patch -p1 --verbose \ +#cat $SRCDIR/patches/libreoffice.multimonitor.patch | patch -p1 --verbose \ # 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log if [ -z "$SRCURL[0]" ]; then @@ -1303,8 +1303,7 @@ mkdir -p $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION || true cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION/$PRGNAM.SlackBuild #cat $SRCDIR/Slackware.conf.in > $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION/Slackware.conf.in -mkdir -p $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION/patches -cp $SRCDIR/*.patch $SRCDIR/*.diff $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION/patches/ || true +cp -a $SRCDIR/patches $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION/ || true chown -R root:root $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION find $PKG/usr/doc -type f -exec chmod 644 {} \; diff --git a/libreoffice/build/libreoffice41.SlackBuild b/libreoffice/build/libreoffice41.SlackBuild index 96e09156..41e84ab2 100755 --- a/libreoffice/build/libreoffice41.SlackBuild +++ b/libreoffice/build/libreoffice41.SlackBuild @@ -737,7 +737,7 @@ echo Building ... ## Apply our own (borrowed) patches. #touch $OUTPUT/patch-$PRGNAM.log -#cat $SRCDIR/libreoffice.boost_1.53.patch | patch -p1 --verbose \ +#cat $SRCDIR/patches/libreoffice.boost_1.53.patch | patch -p1 --verbose \ # 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log if [ -z "$SRCURL[0]" ]; then @@ -1234,8 +1234,7 @@ mkdir -p $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER} cp -a $DOCS $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER} || true cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/$PRGNAM.SlackBuild #cat $SRCDIR/Slackware.conf.in > $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/Slackware.conf.in -mkdir -p $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/patches -cp $SRCDIR/*.patch $SRCDIR/*.diff $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/patches/ || true +cp -ia $SRCDIR/patches $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/ || true chown -R root:root $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER} find $PKG/usr/doc -type f -exec chmod 644 {} \; diff --git a/libreoffice/build/libreoffice42.SlackBuild b/libreoffice/build/libreoffice42.SlackBuild index 96e09156..41e84ab2 100755 --- a/libreoffice/build/libreoffice42.SlackBuild +++ b/libreoffice/build/libreoffice42.SlackBuild @@ -737,7 +737,7 @@ echo Building ... ## Apply our own (borrowed) patches. #touch $OUTPUT/patch-$PRGNAM.log -#cat $SRCDIR/libreoffice.boost_1.53.patch | patch -p1 --verbose \ +#cat $SRCDIR/patches/libreoffice.boost_1.53.patch | patch -p1 --verbose \ # 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log if [ -z "$SRCURL[0]" ]; then @@ -1234,8 +1234,7 @@ mkdir -p $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER} cp -a $DOCS $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER} || true cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/$PRGNAM.SlackBuild #cat $SRCDIR/Slackware.conf.in > $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/Slackware.conf.in -mkdir -p $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/patches -cp $SRCDIR/*.patch $SRCDIR/*.diff $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/patches/ || true +cp -ia $SRCDIR/patches $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/ || true chown -R root:root $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER} find $PKG/usr/doc -type f -exec chmod 644 {} \; diff --git a/libreoffice/build/libreoffice43.SlackBuild b/libreoffice/build/libreoffice43.SlackBuild index 96e09156..41e84ab2 100755 --- a/libreoffice/build/libreoffice43.SlackBuild +++ b/libreoffice/build/libreoffice43.SlackBuild @@ -737,7 +737,7 @@ echo Building ... ## Apply our own (borrowed) patches. #touch $OUTPUT/patch-$PRGNAM.log -#cat $SRCDIR/libreoffice.boost_1.53.patch | patch -p1 --verbose \ +#cat $SRCDIR/patches/libreoffice.boost_1.53.patch | patch -p1 --verbose \ # 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log if [ -z "$SRCURL[0]" ]; then @@ -1234,8 +1234,7 @@ mkdir -p $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER} cp -a $DOCS $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER} || true cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/$PRGNAM.SlackBuild #cat $SRCDIR/Slackware.conf.in > $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/Slackware.conf.in -mkdir -p $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/patches -cp $SRCDIR/*.patch $SRCDIR/*.diff $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/patches/ || true +cp -ia $SRCDIR/patches $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/ || true chown -R root:root $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER} find $PKG/usr/doc -type f -exec chmod 644 {} \; |