diff options
Diffstat (limited to 'source/xap')
3 files changed, 19 insertions, 32 deletions
diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild index 1ad24f533..c5730f5d6 100755 --- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild +++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild @@ -180,9 +180,6 @@ fi # Don't define a function that's included starting in glibc-2.36: zcat $CWD/arc4random_buf.glibc-2.36.diff.gz | patch -p1 --verbose || exit 1 -# Fix building with newer cbindgen: -zcat $CWD/thunderbird.cbindgen-0.24.3.diff.gz | patch -p1 --verbose || exit 1 - # Fetch localization, if requested: if [ ! -z $MOZLOCALIZE ]; then LOC_TAG="THUNDERBIRD_$( echo $VERSION | tr \. _ )_RELEASE" diff --git a/source/xap/mozilla-thunderbird/thunderbird.cbindgen-0.24.3.diff b/source/xap/mozilla-thunderbird/thunderbird.cbindgen-0.24.3.diff deleted file mode 100644 index cd05437d2..000000000 --- a/source/xap/mozilla-thunderbird/thunderbird.cbindgen-0.24.3.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- ./gfx/webrender_bindings/webrender_ffi.h.orig 2022-11-29 09:56:59.000000000 -0600 -+++ ./gfx/webrender_bindings/webrender_ffi.h 2022-12-07 13:03:07.952026999 -0600 -@@ -73,7 +73,6 @@ - struct WrPipelineIdAndEpoch; - using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpoch>; - --const uint64_t ROOT_CLIP_CHAIN = ~0; - - } // namespace wr - } // namespace mozilla diff --git a/source/xap/xscreensaver/xscreensaver.electricsheep.diff b/source/xap/xscreensaver/xscreensaver.electricsheep.diff index 27b11961c..b8ef4e527 100644 --- a/source/xap/xscreensaver/xscreensaver.electricsheep.diff +++ b/source/xap/xscreensaver/xscreensaver.electricsheep.diff @@ -1,20 +1,20 @@ ---- ./driver/XScreenSaver_ad.h.orig 2008-12-28 01:59:19.000000000 -0600 -+++ ./driver/XScreenSaver_ad.h 2009-05-15 16:22:44.000000000 -0500 -@@ -138,6 +138,7 @@ - squiral -root \\n\ - wander -root \\n\ - - webcollage -root \\n\ -+ electricsheep --root 1 \\n\ - xflame -root \\n\ - xmatrix -root \\n\ - GL: gflux -root \\n\ ---- ./driver/XScreenSaver.ad.in.orig 2008-12-28 01:33:15.000000000 -0600 -+++ ./driver/XScreenSaver.ad.in 2009-05-15 16:22:04.000000000 -0500 -@@ -239,6 +239,7 @@ - squiral -root \n\ - wander -root \n\ - - webcollage -root \n\ +--- ./driver/XScreenSaver.ad.in.orig 2022-12-11 14:32:55.000000000 -0600 ++++ ./driver/XScreenSaver.ad.in 2022-12-12 13:21:20.761072115 -0600 +@@ -411,6 +411,7 @@ + spotlight --root \n\ + squiral --root \n\ + wander --root \n\ + electricsheep --root 1 \n\ - xflame -root \n\ - xmatrix -root \n\ - @GL_KLUDGE@ GL: gflux -root \n\ + xflame --root \n\ + xmatrix --root \n\ + @GL_KLUDGE@ GL: gflux --root \n\ +--- ./driver/XScreenSaver_ad.h.orig 2022-12-11 15:08:39.000000000 -0600 ++++ ./driver/XScreenSaver_ad.h 2022-12-12 13:21:24.404072196 -0600 +@@ -266,6 +266,7 @@ + spotlight --root \\n\ + squiral --root \\n\ + wander --root \\n\ ++ electricsheep --root 1 \\n\ + xflame --root \\n\ + xmatrix --root \\n\ + GL: gflux --root \\n\ |