Compare commits
3 Commits
e21e125d56
...
4c6b2d745a
| Author | SHA1 | Date |
|---|---|---|
 John McQuah
|
4c6b2d745a | |
|
John McQuah
|
5ccaf1e74a | |
|
John McQuah
|
35eea37498 |
15
REPO
15
REPO
|
|
@ -93,8 +93,8 @@ f:1ff4aa0bb14d7fb4e64fb1ddf757b979:libjxl/.footprint
|
|||
f:2ee96ffa1eb73caa8437f5bcbb22b810:python3-slugify/.signature
|
||||
f:86357648c850d82b1edd510314bc7152:python3-slugify/Pkgfile
|
||||
f:6bc6bfa36d846e62c63348b2f8d54569:python3-slugify/.footprint
|
||||
f:615f8de7422c720af34722f316b71e35:xournalpp/.signature
|
||||
f:08388ff582eb8d0f887351afac434ab3:xournalpp/Pkgfile
|
||||
f:c17e1db3e7aa595faa8dcad9f97613f3:xournalpp/.signature
|
||||
f:b2716c54b4640b1e57b7b392b4ae0345:xournalpp/Pkgfile
|
||||
f:73f43a5bbfc666d2fc31825ca6991b0d:xournalpp/.footprint
|
||||
f:b4876d82493de47a71ef1562e613539d:texlive-base/README
|
||||
f:85d9a28badf0967c2b3a29aa5a320e4f:texlive-base/tabu.sty.diff
|
||||
|
|
@ -148,8 +148,8 @@ f:69ec1eeafad09bbecb022c340af66853:lbreakouthd/.footprint
|
|||
f:d8f351d4fb547859ae62a6aec84e2a2e:xclock/.signature
|
||||
f:63dd2c0915dada0d2d57d4973852e693:xclock/Pkgfile
|
||||
f:9e7fd2d9b0727049d7af602113e27204:xclock/.footprint
|
||||
f:15f4d974ce6edac189097b833790020b:wf-recorder/.signature
|
||||
f:3b507d750eb51a6cfa446014e270a1ab:wf-recorder/Pkgfile
|
||||
f:7c95c71930e51d5d23f1cc849b16ab4f:wf-recorder/.signature
|
||||
f:3d96897e5a6a37cb150bbbc4d5d3b92f:wf-recorder/Pkgfile
|
||||
f:a73c76b58ce320bdc2c96e10e6bea7e6:wf-recorder/.footprint
|
||||
f:b805ec30f0bf5689ff06a08168726c0f:fortune-mod/.signature
|
||||
f:017679266fb4234007ea9068a755a6a1:fortune-mod/Pkgfile
|
||||
|
|
@ -183,10 +183,9 @@ f:93b0c55f975a99354fc78cc8a0d6506c:zathura-pdf-poppler/.signature
|
|||
f:ae30d3e814516e1b46ffe0900f5b6b22:zathura-pdf-poppler/Pkgfile
|
||||
f:3961411333908c5200c5ba74f8240798:zathura-pdf-poppler/.footprint
|
||||
f:95ed2c92dd96132378050eca03da25c6:webkitgtk-60/README
|
||||
f:cad94c47b122c27d68dfc0b8eb02831c:webkitgtk-60/1bad176b2496579d760852c80cff3ad9fb7c3a4b.patch
|
||||
f:689def4cd2753cc704c0d0e38eefc6b2:webkitgtk-60/.signature
|
||||
f:906c84f2660c92040cdaee890f7866ad:webkitgtk-60/Pkgfile
|
||||
f:a6a01373c6f9e7ee98a04ff2fae200f6:webkitgtk-60/.footprint
|
||||
f:18e20ca2d2e015fc7d2e4c1a15a0b73b:webkitgtk-60/.signature
|
||||
f:6a873d3204cfd7b6e39ea741b94e13c3:webkitgtk-60/Pkgfile
|
||||
f:9b94cbdaa307d66f46de0026bbb3b5d2:webkitgtk-60/.footprint
|
||||
f:0cc425d03faffdcc793b0af7ec749893:libfreeimage-lite/.signature
|
||||
f:c4a660d93a260478a5f4d246be1c260d:libfreeimage-lite/Pkgfile
|
||||
f:55654b9c5c4042bbd1ca6d158629d37a:libfreeimage-lite/.footprint
|
||||
|
|
|
|||
|
|
@ -103,11 +103,11 @@ drwxr-xr-x root/root usr/lib/girepository-1.0/
|
|||
-rw-r--r-- root/root usr/lib/girepository-1.0/WebKit-6.0.typelib
|
||||
-rw-r--r-- root/root usr/lib/girepository-1.0/WebKitWebProcessExtension-6.0.typelib
|
||||
lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-6.0.so -> libjavascriptcoregtk-6.0.so.1
|
||||
lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-6.0.so.1 -> libjavascriptcoregtk-6.0.so.1.1.11
|
||||
-rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-6.0.so.1.1.11
|
||||
lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-6.0.so.1 -> libjavascriptcoregtk-6.0.so.1.1.12
|
||||
-rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-6.0.so.1.1.12
|
||||
lrwxrwxrwx root/root usr/lib/libwebkitgtk-6.0.so -> libwebkitgtk-6.0.so.4
|
||||
lrwxrwxrwx root/root usr/lib/libwebkitgtk-6.0.so.4 -> libwebkitgtk-6.0.so.4.4.5
|
||||
-rwxr-xr-x root/root usr/lib/libwebkitgtk-6.0.so.4.4.5
|
||||
lrwxrwxrwx root/root usr/lib/libwebkitgtk-6.0.so.4 -> libwebkitgtk-6.0.so.4.4.6
|
||||
-rwxr-xr-x root/root usr/lib/libwebkitgtk-6.0.so.4.4.6
|
||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/javascriptcoregtk-6.0.pc
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/webkitgtk-6.0.pc
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
untrusted comment: verify with /etc/ports/jmq.pub
|
||||
RWTTPlFarK9CxEqF8i5jiF7NqtjdRD8jwVqkNua9IneND3K2lCy7id573d5Q2Q1bKd5KKiBvEpHfCDWjS8WaAc+8AOn4Y6wNcQs=
|
||||
SHA256 (Pkgfile) = ee0a24e466793bcf334ebc2606511e622f4490bf0234f0f8cfbf78fe3f33eab3
|
||||
SHA256 (.footprint) = a284c7299c97bda7812829e51f3e9d22dd94e9572aa57f143dec01544d1e2f4e
|
||||
SHA256 (webkitgtk-2.42.2.tar.xz) = 5720aa3e8627f1b9f63252187d4df0f8233ae71d697b1796ebfbe5ca750bd118
|
||||
SHA256 (1bad176b2496579d760852c80cff3ad9fb7c3a4b.patch) = c286efbff5b3693a155040eb6d81cd7096e75276cd632ae0c83d059f03b9bd9f
|
||||
RWTTPlFarK9CxPBEv8NxGHg1XZW7IANF9LbNtqXpZgARR2HbUA9UFcGFoWxLIldxhf1laUMl6Kkj3WLbNM0S9cXL43U9F/ITmwI=
|
||||
SHA256 (Pkgfile) = 8d5517d6e7b3ed63be3b718bb153142919f7c1b2147f5fcb34be4042d3fe7ff8
|
||||
SHA256 (.footprint) = b87914020d41d3801e5967758a0a14ce00cbe34fa01468fb0957a9b199e29038
|
||||
SHA256 (webkitgtk-2.42.3.tar.xz) = 0a1a4630045628b3a6fe95da72dc47852cff20d66be1ac6fd0d669c88c13d8e2
|
||||
|
|
|
|||
|
|
@ -1,56 +0,0 @@
|
|||
From 1bad176b2496579d760852c80cff3ad9fb7c3a4b Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Perez de Castro <aperez@igalia.com>
|
||||
Date: Mon, 20 Nov 2023 07:42:30 -0800
|
||||
Subject: [PATCH] Build fails with libxml2 version 2.12.0 due to API change
|
||||
https://bugs.webkit.org/show_bug.cgi?id=265128
|
||||
|
||||
Reviewed by Philippe Normand.
|
||||
|
||||
Starting with libxml2 2.12.0, the API has changed the const-ness of the
|
||||
xmlError pointers, which results in a build error due to a mismatched
|
||||
type in the parsing error callback. This papers over the difference by
|
||||
using preprocessor conditionals.
|
||||
|
||||
* Source/WebCore/xml/XSLTProcessor.h: Use const when building against
|
||||
libxml2 2.12.0 or newer.
|
||||
* Source/WebCore/xml/XSLTProcessorLibxslt.cpp:
|
||||
(WebCore::XSLTProcessor::parseErrorFunc): Ditto.
|
||||
|
||||
Canonical link: https://commits.webkit.org/270977@main
|
||||
---
|
||||
Source/WebCore/xml/XSLTProcessor.h | 4 ++++
|
||||
Source/WebCore/xml/XSLTProcessorLibxslt.cpp | 4 ++++
|
||||
2 files changed, 8 insertions(+)
|
||||
|
||||
diff --git a/Source/WebCore/xml/XSLTProcessor.h b/Source/WebCore/xml/XSLTProcessor.h
|
||||
index 21bb45b5cbe1..5cf20557918f 100644
|
||||
--- a/Source/WebCore/xml/XSLTProcessor.h
|
||||
+++ b/Source/WebCore/xml/XSLTProcessor.h
|
||||
@@ -61,7 +61,11 @@ class XSLTProcessor : public RefCounted<XSLTProcessor> {
|
||||
|
||||
void reset();
|
||||
|
||||
+#if LIBXML_VERSION >= 21200
|
||||
+ static void parseErrorFunc(void* userData, const xmlError*);
|
||||
+#else
|
||||
static void parseErrorFunc(void* userData, xmlError*);
|
||||
+#endif
|
||||
static void genericErrorFunc(void* userData, const char* msg, ...);
|
||||
|
||||
// Only for libXSLT callbacks
|
||||
diff --git a/Source/WebCore/xml/XSLTProcessorLibxslt.cpp b/Source/WebCore/xml/XSLTProcessorLibxslt.cpp
|
||||
index a65691087e3c..9f6b363dfc6c 100644
|
||||
--- a/Source/WebCore/xml/XSLTProcessorLibxslt.cpp
|
||||
+++ b/Source/WebCore/xml/XSLTProcessorLibxslt.cpp
|
||||
@@ -59,7 +59,11 @@ void XSLTProcessor::genericErrorFunc(void*, const char*, ...)
|
||||
// It would be nice to do something with this error message.
|
||||
}
|
||||
|
||||
+#if LIBXML_VERSION >= 21200
|
||||
+void XSLTProcessor::parseErrorFunc(void* userData, const xmlError* error)
|
||||
+#else
|
||||
void XSLTProcessor::parseErrorFunc(void* userData, xmlError* error)
|
||||
+#endif
|
||||
{
|
||||
PageConsoleClient* console = static_cast<PageConsoleClient*>(userData);
|
||||
if (!console)
|
||||
|
|
@ -5,19 +5,18 @@
|
|||
# Optional: enchant libjxl libnotify geoclue openjpeg2 xdg-dbus-proxy bubblewrap pipewire wpebackend-fdo libmanette
|
||||
|
||||
name=webkitgtk-60
|
||||
version=2.42.2
|
||||
release=2
|
||||
source=(https://webkitgtk.org/releases/webkitgtk-$version.tar.xz
|
||||
1bad176b2496579d760852c80cff3ad9fb7c3a4b.patch)
|
||||
version=2.42.3
|
||||
release=1
|
||||
source=(https://webkitgtk.org/releases/webkitgtk-$version.tar.xz)
|
||||
|
||||
build() {
|
||||
# fail the build if dependencies are not met
|
||||
[ -e /usr/include/harfbuzz/hb-icu.h ] || \
|
||||
{ echo "Rebuild harfbuzz with icu present; otherwise webkitgtk will not work."; exit 1; }
|
||||
|
||||
for p in $SRC/*.patch; do
|
||||
patch -Np1 -d webkitgtk-$version -i $p
|
||||
done
|
||||
#for p in $SRC/*.patch; do
|
||||
# patch -Np1 -d webkitgtk-$version -i $p
|
||||
#done
|
||||
|
||||
PKGMK_WEBKITGTK=(-G Ninja -D CMAKE_BUILD_TYPE=Release
|
||||
-Wno-dev -D CMAKE_INSTALL_PREFIX:PATH=/usr
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
untrusted comment: verify with /etc/ports/jmq.pub
|
||||
RWTTPlFarK9CxJUobTfk2+LxHW8yhCFVH5ck3FzBJdhMBvMwPkwEb0vF6CrYmjb2NRAQmP+VFLNT4GBifAsQxdJjTu2XIb0qWAo=
|
||||
SHA256 (Pkgfile) = 6547cac4f8c99b8155fac0c827536273a1472f46c2bb3c8c16115808c4dc3c65
|
||||
RWTTPlFarK9CxFfntctZvdBCWl28lqm3FnaRyVxww+OTGnG12k5BSHnFxLhOVmDPIvRhHC3KcO9ufW6o+Naeak87bcpDNvWTJQY=
|
||||
SHA256 (Pkgfile) = 713e260b879a9c92fa01cf213986e4652d610f792fec57fbf6a50b473edf2a35
|
||||
SHA256 (.footprint) = 7c94f0b49269a2ee6586c1a5d7d66c9847e702b724fd4e05fdde35df5e267cae
|
||||
SHA256 (wf-recorder-0.4.1.tar.xz) = 502ba54db8aaf5ebd280738f065c73409694a1440b9a660ef5c4e398714c51f7
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
# Description: screen recording app for the wayland desktop
|
||||
# URL: https://github.com/ammen99/wf-recorder/
|
||||
# Maintainer: John McQuah, jmcquah at disroot dot org
|
||||
# Depends on: ffmpeg pulseaudio wayland-protocols
|
||||
# Nice to have: x265
|
||||
# Depends on: ffmpeg wayland-protocols
|
||||
# Optional: pulseaudio x265
|
||||
|
||||
name=wf-recorder
|
||||
version=0.4.1
|
||||
release=1
|
||||
release=2
|
||||
source=(https://github.com/ammen99/$name/releases/download/v$version/$name-$version.tar.xz)
|
||||
|
||||
build() {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
untrusted comment: verify with /etc/ports/jmq.pub
|
||||
RWTTPlFarK9CxLo7LUrwrvoRlFcie5pHWP9/XLDvlCEJXR0gn4Z0sL5VGxSwMWUuD6cIJ3EOsmANNIH7jO0zFhiuaAzAsoBZYwY=
|
||||
SHA256 (Pkgfile) = 984a531be04775a1763cdd305cf0ec7464a91fea248f77013863fec3e9ce4c10
|
||||
RWTTPlFarK9CxM/24cXt2alH38hanQ0lpGAreotGd9EfCe9d/eFuwRBIxflVO1zroP6xXWF0X3LvQKodhIiPnMZyKxkm5pq5MQg=
|
||||
SHA256 (Pkgfile) = 4ec88ae2aa19dd45e5dff0f97bca23a404802bed47b3d3b92729ed16606500ca
|
||||
SHA256 (.footprint) = ec2f24969ad72c3f91a95252ce54ba6636f296e6ac8f9aa1c2a40346a44b9385
|
||||
SHA256 (xournalpp-1.2.2.tar.gz) = b873ea4e2beadc3061fab87faef31c374ae7876c88dbda5565c491945cf7290f
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Description: notetaking and PDF annotation software
|
||||
# URL: https://github.com/xournalpp/xournalpp
|
||||
# Maintainer: John McQuah, jmcquah at disroot dot org
|
||||
# Depends on: adwaita-icon-theme gtksourceview libsndfile libzip lua poppler-glib portaudio-cpp
|
||||
# Depends on: gtksourceview libsndfile libzip lua poppler portaudio-cpp
|
||||
# Optional: gpgme texlive
|
||||
|
||||
name=xournalpp
|
||||
|
|
@ -10,6 +10,10 @@ release=1
|
|||
source=(https://github.com/$name/$name/archive/v$version/$name-$version.tar.gz)
|
||||
|
||||
build() {
|
||||
# fail the build if dependencies are not met
|
||||
[ -e /usr/include/poppler/glib/poppler.h ] || \
|
||||
{ echo "Rebuild poppler with glib present; otherwise xournalpp will not work."; exit 1; }
|
||||
|
||||
cmake -S $name-$version -B build -G Ninja \
|
||||
-DCMAKE_INSTALL_PREFIX="/usr" \
|
||||
-DCMAKE_C_FLAGS="$CFLAGS" \
|
||||
|
|
|
|||
Loading…
Reference in New Issue