* Re: discount: update to 3.0.0d
2024-11-19 12:57 [PR PATCH] discount: update to 3.0.0d MIvanchev
@ 2024-11-19 12:57 ` MIvanchev
2024-11-19 13:00 ` [PR PATCH] [Updated] " MIvanchev
` (14 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: MIvanchev @ 2024-11-19 12:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 238 bytes --]
New comment by MIvanchev on void-packages repository
https://github.com/void-linux/void-packages/pull/53142#issuecomment-2485648004
Comment:
CC @leahneukirchen: I added make install.everything to make sure `makepage` is also available.
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] discount: update to 3.0.0d
2024-11-19 12:57 [PR PATCH] discount: update to 3.0.0d MIvanchev
2024-11-19 12:57 ` MIvanchev
@ 2024-11-19 13:00 ` MIvanchev
2024-11-19 13:06 ` leahneukirchen
` (13 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: MIvanchev @ 2024-11-19 13:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages discount
https://github.com/void-linux/void-packages/pull/53142
discount: update to 3.0.0d
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
A patch file from https://github.com/void-linux/void-packages/pull/53142.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-discount-53142.patch --]
[-- Type: text/x-diff, Size: 1928 bytes --]
From 34d6940cc35dc18b87762f7321db8c6edc053a16 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 13:56:26 +0100
Subject: [PATCH 1/2] discount: bump common/shlibs
---
common/shlibs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/shlibs b/common/shlibs
index 381c6ef8bcc866..8503c3e4bb7729 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2793,7 +2793,7 @@ libsmpeg2-2.0.so.0 smpeg2-2.0.0_1
libedac.so.1 libedac-0.18_1
libxlsreader.so.8 libxls-1.6.1_1
libR.so R-4.0.2_1
-libmarkdown.so.2 discount-2.2.0_3
+libmarkdown.so.3 discount-3.0.0d_1
libkeystone.so.0 keystone-0.9_1
libmate-slab.so.0 libmate-control-center-1.14.0_2
libuev.so.3 libuev-2.4.0_1
From 0d25d317c5efb2318994f39cb7c213b80eafc22b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 13:51:11 +0100
Subject: [PATCH 2/2] discount: update to 3.0.0d
---
srcpkgs/discount/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/discount/template b/srcpkgs/discount/template
index d61cfffb8b41de..e8009d8a7a6e33 100644
--- a/srcpkgs/discount/template
+++ b/srcpkgs/discount/template
@@ -1,6 +1,6 @@
# Template file for 'discount'
pkgname=discount
-version=2.2.7d
+version=3.0.0d
revision=1
build_style=configure
configure_script="./configure.sh"
@@ -10,11 +10,11 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="http://www.pell.portland.or.us/~orc/Code/discount"
distfiles="https://github.com/Orc/discount/archive/v${version}.tar.gz"
-checksum=eb9f6629dadddb44c3111267b82e51d5fb8364e228cc3533fe937d8a99e0155b
+checksum=0ed8cc27ac5d46dc6a8beedd5e5673ac8b466a6474bdb7d35f37c815f670385f
disable_parallel_build=yes
do_install() {
- make DESTDIR=${DESTDIR} install install.man
+ make DESTDIR=${DESTDIR} install.everything
vlicense COPYRIGHT
}
discount-devel_package() {
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: discount: update to 3.0.0d
2024-11-19 12:57 [PR PATCH] discount: update to 3.0.0d MIvanchev
2024-11-19 12:57 ` MIvanchev
2024-11-19 13:00 ` [PR PATCH] [Updated] " MIvanchev
@ 2024-11-19 13:06 ` leahneukirchen
2024-11-19 13:07 ` [PR PATCH] [Updated] " MIvanchev
` (12 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: leahneukirchen @ 2024-11-19 13:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 853 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/53142#issuecomment-2485665632
Comment:
You also need to revbump all reverse dependencies:
```
% xbps-query -R --regex -p shlib-requires -s libmarkdown
Minder-1.14.0_2: libmarkdown.so.2 (https://repo-default.voidlinux.org/current)
cutemarked-0.11.3_8: libmarkdown.so.2 (https://repo-default.voidlinux.org/current)
kdepim-addons-24.08.0_1: libmarkdown.so.2 (https://repo-default.voidlinux.org/current)
libpurple-mattermost-1.2_1: libmarkdown.so.2 (https://repo-default.voidlinux.org/current)
notes-up-2.0.6_2: libmarkdown.so.2 (https://repo-default.voidlinux.org/current)
okular-24.08.1_1: libmarkdown.so.2 (https://repo-default.voidlinux.org/current)
pdfpc-4.6.0_2: libmarkdown.so.2 (https://repo-default.voidlinux.org/current)
```
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] discount: update to 3.0.0d
2024-11-19 12:57 [PR PATCH] discount: update to 3.0.0d MIvanchev
` (2 preceding siblings ...)
2024-11-19 13:06 ` leahneukirchen
@ 2024-11-19 13:07 ` MIvanchev
2024-11-19 13:33 ` leahneukirchen
` (11 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: MIvanchev @ 2024-11-19 13:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages discount
https://github.com/void-linux/void-packages/pull/53142
discount: update to 3.0.0d
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
A patch file from https://github.com/void-linux/void-packages/pull/53142.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-discount-53142.patch --]
[-- Type: text/x-diff, Size: 5588 bytes --]
From 34d6940cc35dc18b87762f7321db8c6edc053a16 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 13:56:26 +0100
Subject: [PATCH 1/7] discount: bump common/shlibs
---
common/shlibs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/shlibs b/common/shlibs
index 381c6ef8bcc866..8503c3e4bb7729 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2793,7 +2793,7 @@ libsmpeg2-2.0.so.0 smpeg2-2.0.0_1
libedac.so.1 libedac-0.18_1
libxlsreader.so.8 libxls-1.6.1_1
libR.so R-4.0.2_1
-libmarkdown.so.2 discount-2.2.0_3
+libmarkdown.so.3 discount-3.0.0d_1
libkeystone.so.0 keystone-0.9_1
libmate-slab.so.0 libmate-control-center-1.14.0_2
libuev.so.3 libuev-2.4.0_1
From 0d25d317c5efb2318994f39cb7c213b80eafc22b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 13:51:11 +0100
Subject: [PATCH 2/7] discount: update to 3.0.0d
---
srcpkgs/discount/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/discount/template b/srcpkgs/discount/template
index d61cfffb8b41de..e8009d8a7a6e33 100644
--- a/srcpkgs/discount/template
+++ b/srcpkgs/discount/template
@@ -1,6 +1,6 @@
# Template file for 'discount'
pkgname=discount
-version=2.2.7d
+version=3.0.0d
revision=1
build_style=configure
configure_script="./configure.sh"
@@ -10,11 +10,11 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="http://www.pell.portland.or.us/~orc/Code/discount"
distfiles="https://github.com/Orc/discount/archive/v${version}.tar.gz"
-checksum=eb9f6629dadddb44c3111267b82e51d5fb8364e228cc3533fe937d8a99e0155b
+checksum=0ed8cc27ac5d46dc6a8beedd5e5673ac8b466a6474bdb7d35f37c815f670385f
disable_parallel_build=yes
do_install() {
- make DESTDIR=${DESTDIR} install install.man
+ make DESTDIR=${DESTDIR} install.everything
vlicense COPYRIGHT
}
discount-devel_package() {
From 04601d4004a1f37f7247f6802d1535a0ad8de4ff Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 14:05:52 +0100
Subject: [PATCH 3/7] Minder: bump revision to update shlibs
---
srcpkgs/Minder/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Minder/template b/srcpkgs/Minder/template
index c128c62552fae7..477da7ccb12da9 100644
--- a/srcpkgs/Minder/template
+++ b/srcpkgs/Minder/template
@@ -1,7 +1,7 @@
# Template file for 'Minder'
pkgname=Minder
version=1.14.0
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext glib-devel vala"
makedepends="cairo-devel granite-devel gtk+3-devel libxml2-devel libgee08-devel
From 99039fe827cf9231326f1c6d347b9a3517ec6bf3 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 14:06:04 +0100
Subject: [PATCH 4/7] cutemarked: bump revision to update shlibs
---
srcpkgs/cutemarked/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cutemarked/template b/srcpkgs/cutemarked/template
index 9723219bda6a40..e52d53a0b86ebe 100644
--- a/srcpkgs/cutemarked/template
+++ b/srcpkgs/cutemarked/template
@@ -2,7 +2,7 @@
pkgname=cutemarked
reverts="v0.11.0_1"
version=0.11.3
-revision=8
+revision=9
build_style=qmake
hostmakedepends="pkg-config qt5-qmake"
makedepends="qt5-devel qt5-tools-devel qt5-webkit-devel discount-devel hunspell-devel"
From 0015b8a57bf836afcef47db65ec15b496ab254ca Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 14:06:27 +0100
Subject: [PATCH 5/7] kdepim-addons: bump revision to update shlibs
---
srcpkgs/kdepim-addons/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kdepim-addons/template b/srcpkgs/kdepim-addons/template
index 4334bf98c66b07..14e17d68e0d60b 100644
--- a/srcpkgs/kdepim-addons/template
+++ b/srcpkgs/kdepim-addons/template
@@ -1,7 +1,7 @@
# Template file for 'kdepim-addons'
pkgname=kdepim-addons
version=24.08.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From d754990c6902d3031128bba6272432a7748db587 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 14:06:41 +0100
Subject: [PATCH 6/7] notes-up: bump revision to update shlibs
---
srcpkgs/notes-up/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/notes-up/template b/srcpkgs/notes-up/template
index 43e621cbdb66da..715d777a39bbe3 100644
--- a/srcpkgs/notes-up/template
+++ b/srcpkgs/notes-up/template
@@ -1,7 +1,7 @@
# Template file for 'notes-up'
pkgname=notes-up
version=2.0.6
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config vala gettext glib-devel"
makedepends="libgee08-devel discount-devel libwebkit2gtk41-devel granite-devel
From d1f2a5737a10e882d3c00a6eccb8aaed5f560d10 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 14:07:07 +0100
Subject: [PATCH 7/7] okular: bump revision to update shlibs
---
srcpkgs/okular/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 979057cee0566a..d0a4eaaabe6a40 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,7 +1,7 @@
# Template file for 'okular'
pkgname=okular
version=24.08.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: discount: update to 3.0.0d
2024-11-19 12:57 [PR PATCH] discount: update to 3.0.0d MIvanchev
` (3 preceding siblings ...)
2024-11-19 13:07 ` [PR PATCH] [Updated] " MIvanchev
@ 2024-11-19 13:33 ` leahneukirchen
2024-11-19 13:41 ` MIvanchev
` (10 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: leahneukirchen @ 2024-11-19 13:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 170 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/53142#issuecomment-2485729481
Comment:
cutemarked is broken.
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: discount: update to 3.0.0d
2024-11-19 12:57 [PR PATCH] discount: update to 3.0.0d MIvanchev
` (4 preceding siblings ...)
2024-11-19 13:33 ` leahneukirchen
@ 2024-11-19 13:41 ` MIvanchev
2024-11-19 13:50 ` MIvanchev
` (9 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: MIvanchev @ 2024-11-19 13:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 279 bytes --]
New comment by MIvanchev on void-packages repository
https://github.com/void-linux/void-packages/pull/53142#issuecomment-2485757853
Comment:
@leahneukirchen cutemarked is broken without a big chance of recovery, seems to be incompatible with the newest changes. Please advise.
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: discount: update to 3.0.0d
2024-11-19 12:57 [PR PATCH] discount: update to 3.0.0d MIvanchev
` (5 preceding siblings ...)
2024-11-19 13:41 ` MIvanchev
@ 2024-11-19 13:50 ` MIvanchev
2024-11-19 16:55 ` [PR PATCH] [Updated] " MIvanchev
` (8 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: MIvanchev @ 2024-11-19 13:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 176 bytes --]
New comment by MIvanchev on void-packages repository
https://github.com/void-linux/void-packages/pull/53142#issuecomment-2485777817
Comment:
@leahneukirchen Let me patch it.
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] discount: update to 3.0.0d
2024-11-19 12:57 [PR PATCH] discount: update to 3.0.0d MIvanchev
` (6 preceding siblings ...)
2024-11-19 13:50 ` MIvanchev
@ 2024-11-19 16:55 ` MIvanchev
2024-11-19 17:12 ` MIvanchev
` (7 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: MIvanchev @ 2024-11-19 16:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages discount
https://github.com/void-linux/void-packages/pull/53142
discount: update to 3.0.0d
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
A patch file from https://github.com/void-linux/void-packages/pull/53142.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-discount-53142.patch --]
[-- Type: text/x-diff, Size: 10636 bytes --]
From 34d6940cc35dc18b87762f7321db8c6edc053a16 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 13:56:26 +0100
Subject: [PATCH 1/7] discount: bump common/shlibs
---
common/shlibs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/shlibs b/common/shlibs
index 381c6ef8bcc866..8503c3e4bb7729 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2793,7 +2793,7 @@ libsmpeg2-2.0.so.0 smpeg2-2.0.0_1
libedac.so.1 libedac-0.18_1
libxlsreader.so.8 libxls-1.6.1_1
libR.so R-4.0.2_1
-libmarkdown.so.2 discount-2.2.0_3
+libmarkdown.so.3 discount-3.0.0d_1
libkeystone.so.0 keystone-0.9_1
libmate-slab.so.0 libmate-control-center-1.14.0_2
libuev.so.3 libuev-2.4.0_1
From 0d25d317c5efb2318994f39cb7c213b80eafc22b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 13:51:11 +0100
Subject: [PATCH 2/7] discount: update to 3.0.0d
---
srcpkgs/discount/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/discount/template b/srcpkgs/discount/template
index d61cfffb8b41de..e8009d8a7a6e33 100644
--- a/srcpkgs/discount/template
+++ b/srcpkgs/discount/template
@@ -1,6 +1,6 @@
# Template file for 'discount'
pkgname=discount
-version=2.2.7d
+version=3.0.0d
revision=1
build_style=configure
configure_script="./configure.sh"
@@ -10,11 +10,11 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="http://www.pell.portland.or.us/~orc/Code/discount"
distfiles="https://github.com/Orc/discount/archive/v${version}.tar.gz"
-checksum=eb9f6629dadddb44c3111267b82e51d5fb8364e228cc3533fe937d8a99e0155b
+checksum=0ed8cc27ac5d46dc6a8beedd5e5673ac8b466a6474bdb7d35f37c815f670385f
disable_parallel_build=yes
do_install() {
- make DESTDIR=${DESTDIR} install install.man
+ make DESTDIR=${DESTDIR} install.everything
vlicense COPYRIGHT
}
discount-devel_package() {
From 04601d4004a1f37f7247f6802d1535a0ad8de4ff Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 14:05:52 +0100
Subject: [PATCH 3/7] Minder: bump revision to update shlibs
---
srcpkgs/Minder/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Minder/template b/srcpkgs/Minder/template
index c128c62552fae7..477da7ccb12da9 100644
--- a/srcpkgs/Minder/template
+++ b/srcpkgs/Minder/template
@@ -1,7 +1,7 @@
# Template file for 'Minder'
pkgname=Minder
version=1.14.0
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext glib-devel vala"
makedepends="cairo-devel granite-devel gtk+3-devel libxml2-devel libgee08-devel
From 73e5d37f66f61cf22c02288eb8c89f621e1eadb3 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 14:06:27 +0100
Subject: [PATCH 4/7] kdepim-addons: bump revision to update shlibs
---
srcpkgs/kdepim-addons/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kdepim-addons/template b/srcpkgs/kdepim-addons/template
index 4334bf98c66b07..14e17d68e0d60b 100644
--- a/srcpkgs/kdepim-addons/template
+++ b/srcpkgs/kdepim-addons/template
@@ -1,7 +1,7 @@
# Template file for 'kdepim-addons'
pkgname=kdepim-addons
version=24.08.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From abe3b30fb758c106c0706a7189bbbec8425f0361 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 14:06:41 +0100
Subject: [PATCH 5/7] notes-up: bump revision to update shlibs
---
srcpkgs/notes-up/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/notes-up/template b/srcpkgs/notes-up/template
index 43e621cbdb66da..715d777a39bbe3 100644
--- a/srcpkgs/notes-up/template
+++ b/srcpkgs/notes-up/template
@@ -1,7 +1,7 @@
# Template file for 'notes-up'
pkgname=notes-up
version=2.0.6
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config vala gettext glib-devel"
makedepends="libgee08-devel discount-devel libwebkit2gtk41-devel granite-devel
From b43cf8c0374ff574de4b2048d5bf9d453fb12d54 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 14:07:07 +0100
Subject: [PATCH 6/7] okular: bump revision to update shlibs
---
srcpkgs/okular/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 979057cee0566a..d0a4eaaabe6a40 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,7 +1,7 @@
# Template file for 'okular'
pkgname=okular
version=24.08.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 9b84fe289bb24a9cb0e255621f10b84eaa0f5ace Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 14:06:04 +0100
Subject: [PATCH 7/7] cutemarked: bump revision to update shlibs
---
srcpkgs/cutemarked/patches/QAction.patch | 10 --
.../cutemarked/patches/compatibilities.patch | 110 ++++++++++++++++++
srcpkgs/cutemarked/template | 2 +-
3 files changed, 111 insertions(+), 11 deletions(-)
delete mode 100644 srcpkgs/cutemarked/patches/QAction.patch
create mode 100644 srcpkgs/cutemarked/patches/compatibilities.patch
diff --git a/srcpkgs/cutemarked/patches/QAction.patch b/srcpkgs/cutemarked/patches/QAction.patch
deleted file mode 100644
index c2fb7bef108911..00000000000000
--- a/srcpkgs/cutemarked/patches/QAction.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/app/optionsdialog.cpp 2016-03-28 13:48:50.000000000 +0200
-+++ b/app/optionsdialog.cpp 2016-03-28 13:48:50.000000000 +0200
-@@ -17,6 +17,7 @@
- #include "optionsdialog.h"
- #include "ui_optionsdialog.h"
-
-+#include <QAction>
- #include <QFontComboBox>
- #include <QItemEditorFactory>
- #include <QKeySequence>
diff --git a/srcpkgs/cutemarked/patches/compatibilities.patch b/srcpkgs/cutemarked/patches/compatibilities.patch
new file mode 100644
index 00000000000000..9121e6f2466bf4
--- /dev/null
+++ b/srcpkgs/cutemarked/patches/compatibilities.patch
@@ -0,0 +1,110 @@
+diff --git a/app-static/converter/discountmarkdownconverter.cpp b/app-static/converter/discountmarkdownconverter.cpp
+index be8715a..702ab3b 100644
+--- a/app-static/converter/discountmarkdownconverter.cpp
++++ b/app-static/converter/discountmarkdownconverter.cpp
+@@ -71,12 +71,15 @@ MarkdownDocument *DiscountMarkdownConverter::createDocument(const QString &text,
+ markdownText.append('\n');
+ }
+
+- unsigned long converterOptions = translateConverterOptions(options);
++ mkd_flag_t *converterOptions = mkd_flags();
++
++ translateConverterOptions(options, converterOptions);
+
+ QByteArray utf8Data = markdownText.toUtf8();
+ doc = mkd_string(utf8Data, utf8Data.length(), converterOptions);
+
+ mkd_compile(doc, converterOptions);
++ mkd_free_flags(converterOptions);
+ }
+
+ return new DiscountMarkdownDocument(doc);
+@@ -136,44 +139,43 @@ MarkdownConverter::ConverterOptions DiscountMarkdownConverter::supportedOptions(
+ MarkdownConverter::NoSuperscriptOption;
+ }
+
+-unsigned long DiscountMarkdownConverter::translateConverterOptions(ConverterOptions options) const
++void DiscountMarkdownConverter::translateConverterOptions(ConverterOptions options, mkd_flag_t *flags) const
+ {
+- unsigned long converterOptions = MKD_TOC | MKD_NOSTYLE;
++ mkd_set_flag_num(flags, MKD_TOC);
++ mkd_set_flag_num(flags, MKD_NOSTYLE);
+
+ // autolink
+ if (options.testFlag(MarkdownConverter::AutolinkOption)) {
+- converterOptions |= MKD_AUTOLINK;
++ mkd_set_flag_num(flags, MKD_AUTOLINK);
+ }
+
+ // strikethrough
+ if (options.testFlag(MarkdownConverter::NoStrikethroughOption)) {
+- converterOptions |= MKD_NOSTRIKETHROUGH;
++ mkd_set_flag_num(flags, MKD_NOSTRIKETHROUGH);
+ }
+
+ // alphabetic lists
+ if (options.testFlag(MarkdownConverter::NoAlphaListOption)) {
+- converterOptions |= MKD_NOALPHALIST;
++ mkd_set_flag_num(flags, MKD_NOALPHALIST);
+ }
+
+ // definition lists
+ if (options.testFlag(MarkdownConverter::NoDefinitionListOption)) {
+- converterOptions |= MKD_NODLIST;
++ // converterOptions |= MKD_NODLIST;
+ }
+
+ // SmartyPants
+ if (options.testFlag(MarkdownConverter::NoSmartypantsOption)) {
+- converterOptions |= MKD_NOPANTS;
++ mkd_set_flag_num(flags, MKD_NOPANTS);
+ }
+
+ // Footnotes
+ if (options.testFlag(MarkdownConverter::ExtraFootnoteOption)) {
+- converterOptions |= MKD_EXTRA_FOOTNOTE;
++ mkd_set_flag_num(flags, MKD_EXTRA_FOOTNOTE);
+ }
+
+ // Superscript
+ if (options.testFlag(MarkdownConverter::NoSuperscriptOption)) {
+- converterOptions |= MKD_NOSUPERSCRIPT;
++ mkd_set_flag_num(flags, MKD_NOSUPERSCRIPT);
+ }
+-
+- return converterOptions;
+ }
+diff --git a/app-static/converter/discountmarkdownconverter.h b/app-static/converter/discountmarkdownconverter.h
+index 2902b5b..fd4c8e9 100644
+--- a/app-static/converter/discountmarkdownconverter.h
++++ b/app-static/converter/discountmarkdownconverter.h
+@@ -34,6 +34,8 @@
+
+ #include "markdownconverter.h"
+
++typedef void mkd_flag_t;
++
+ class DiscountMarkdownConverter : public MarkdownConverter
+ {
+ public:
+@@ -48,7 +50,7 @@ public:
+ virtual ConverterOptions supportedOptions() const;
+
+ private:
+- unsigned long translateConverterOptions(ConverterOptions options) const;
++ void translateConverterOptions(ConverterOptions options, mkd_flag_t *flags) const;
+ };
+
+ #endif // DISCOUNTMARKDOWNCONVERTER_H
+diff --git a/app/optionsdialog.cpp b/app/optionsdialog.cpp
+index 80452d1..e1f67a5 100644
+--- a/app/optionsdialog.cpp
++++ b/app/optionsdialog.cpp
+@@ -17,6 +17,7 @@
+ #include "optionsdialog.h"
+ #include "ui_optionsdialog.h"
+
++#include <QAction>
+ #include <QFontComboBox>
+ #include <QItemEditorFactory>
+ #include <QKeySequence>
diff --git a/srcpkgs/cutemarked/template b/srcpkgs/cutemarked/template
index 9723219bda6a40..e52d53a0b86ebe 100644
--- a/srcpkgs/cutemarked/template
+++ b/srcpkgs/cutemarked/template
@@ -2,7 +2,7 @@
pkgname=cutemarked
reverts="v0.11.0_1"
version=0.11.3
-revision=8
+revision=9
build_style=qmake
hostmakedepends="pkg-config qt5-qmake"
makedepends="qt5-devel qt5-tools-devel qt5-webkit-devel discount-devel hunspell-devel"
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] discount: update to 3.0.0d
2024-11-19 12:57 [PR PATCH] discount: update to 3.0.0d MIvanchev
` (7 preceding siblings ...)
2024-11-19 16:55 ` [PR PATCH] [Updated] " MIvanchev
@ 2024-11-19 17:12 ` MIvanchev
2024-11-19 17:31 ` MIvanchev
` (6 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: MIvanchev @ 2024-11-19 17:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages discount
https://github.com/void-linux/void-packages/pull/53142
discount: update to 3.0.0d
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
A patch file from https://github.com/void-linux/void-packages/pull/53142.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-discount-53142.patch --]
[-- Type: text/x-diff, Size: 11446 bytes --]
From 34d6940cc35dc18b87762f7321db8c6edc053a16 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 13:56:26 +0100
Subject: [PATCH 1/8] discount: bump common/shlibs
---
common/shlibs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/shlibs b/common/shlibs
index 381c6ef8bcc866..8503c3e4bb7729 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2793,7 +2793,7 @@ libsmpeg2-2.0.so.0 smpeg2-2.0.0_1
libedac.so.1 libedac-0.18_1
libxlsreader.so.8 libxls-1.6.1_1
libR.so R-4.0.2_1
-libmarkdown.so.2 discount-2.2.0_3
+libmarkdown.so.3 discount-3.0.0d_1
libkeystone.so.0 keystone-0.9_1
libmate-slab.so.0 libmate-control-center-1.14.0_2
libuev.so.3 libuev-2.4.0_1
From 0d25d317c5efb2318994f39cb7c213b80eafc22b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 13:51:11 +0100
Subject: [PATCH 2/8] discount: update to 3.0.0d
---
srcpkgs/discount/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/discount/template b/srcpkgs/discount/template
index d61cfffb8b41de..e8009d8a7a6e33 100644
--- a/srcpkgs/discount/template
+++ b/srcpkgs/discount/template
@@ -1,6 +1,6 @@
# Template file for 'discount'
pkgname=discount
-version=2.2.7d
+version=3.0.0d
revision=1
build_style=configure
configure_script="./configure.sh"
@@ -10,11 +10,11 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="http://www.pell.portland.or.us/~orc/Code/discount"
distfiles="https://github.com/Orc/discount/archive/v${version}.tar.gz"
-checksum=eb9f6629dadddb44c3111267b82e51d5fb8364e228cc3533fe937d8a99e0155b
+checksum=0ed8cc27ac5d46dc6a8beedd5e5673ac8b466a6474bdb7d35f37c815f670385f
disable_parallel_build=yes
do_install() {
- make DESTDIR=${DESTDIR} install install.man
+ make DESTDIR=${DESTDIR} install.everything
vlicense COPYRIGHT
}
discount-devel_package() {
From 04601d4004a1f37f7247f6802d1535a0ad8de4ff Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 14:05:52 +0100
Subject: [PATCH 3/8] Minder: bump revision to update shlibs
---
srcpkgs/Minder/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Minder/template b/srcpkgs/Minder/template
index c128c62552fae7..477da7ccb12da9 100644
--- a/srcpkgs/Minder/template
+++ b/srcpkgs/Minder/template
@@ -1,7 +1,7 @@
# Template file for 'Minder'
pkgname=Minder
version=1.14.0
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext glib-devel vala"
makedepends="cairo-devel granite-devel gtk+3-devel libxml2-devel libgee08-devel
From 73e5d37f66f61cf22c02288eb8c89f621e1eadb3 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 14:06:27 +0100
Subject: [PATCH 4/8] kdepim-addons: bump revision to update shlibs
---
srcpkgs/kdepim-addons/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kdepim-addons/template b/srcpkgs/kdepim-addons/template
index 4334bf98c66b07..14e17d68e0d60b 100644
--- a/srcpkgs/kdepim-addons/template
+++ b/srcpkgs/kdepim-addons/template
@@ -1,7 +1,7 @@
# Template file for 'kdepim-addons'
pkgname=kdepim-addons
version=24.08.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From abe3b30fb758c106c0706a7189bbbec8425f0361 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 14:06:41 +0100
Subject: [PATCH 5/8] notes-up: bump revision to update shlibs
---
srcpkgs/notes-up/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/notes-up/template b/srcpkgs/notes-up/template
index 43e621cbdb66da..715d777a39bbe3 100644
--- a/srcpkgs/notes-up/template
+++ b/srcpkgs/notes-up/template
@@ -1,7 +1,7 @@
# Template file for 'notes-up'
pkgname=notes-up
version=2.0.6
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config vala gettext glib-devel"
makedepends="libgee08-devel discount-devel libwebkit2gtk41-devel granite-devel
From b43cf8c0374ff574de4b2048d5bf9d453fb12d54 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 14:07:07 +0100
Subject: [PATCH 6/8] okular: bump revision to update shlibs
---
srcpkgs/okular/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 979057cee0566a..d0a4eaaabe6a40 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,7 +1,7 @@
# Template file for 'okular'
pkgname=okular
version=24.08.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 9b84fe289bb24a9cb0e255621f10b84eaa0f5ace Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 14:06:04 +0100
Subject: [PATCH 7/8] cutemarked: bump revision to update shlibs
---
srcpkgs/cutemarked/patches/QAction.patch | 10 --
.../cutemarked/patches/compatibilities.patch | 110 ++++++++++++++++++
srcpkgs/cutemarked/template | 2 +-
3 files changed, 111 insertions(+), 11 deletions(-)
delete mode 100644 srcpkgs/cutemarked/patches/QAction.patch
create mode 100644 srcpkgs/cutemarked/patches/compatibilities.patch
diff --git a/srcpkgs/cutemarked/patches/QAction.patch b/srcpkgs/cutemarked/patches/QAction.patch
deleted file mode 100644
index c2fb7bef108911..00000000000000
--- a/srcpkgs/cutemarked/patches/QAction.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/app/optionsdialog.cpp 2016-03-28 13:48:50.000000000 +0200
-+++ b/app/optionsdialog.cpp 2016-03-28 13:48:50.000000000 +0200
-@@ -17,6 +17,7 @@
- #include "optionsdialog.h"
- #include "ui_optionsdialog.h"
-
-+#include <QAction>
- #include <QFontComboBox>
- #include <QItemEditorFactory>
- #include <QKeySequence>
diff --git a/srcpkgs/cutemarked/patches/compatibilities.patch b/srcpkgs/cutemarked/patches/compatibilities.patch
new file mode 100644
index 00000000000000..9121e6f2466bf4
--- /dev/null
+++ b/srcpkgs/cutemarked/patches/compatibilities.patch
@@ -0,0 +1,110 @@
+diff --git a/app-static/converter/discountmarkdownconverter.cpp b/app-static/converter/discountmarkdownconverter.cpp
+index be8715a..702ab3b 100644
+--- a/app-static/converter/discountmarkdownconverter.cpp
++++ b/app-static/converter/discountmarkdownconverter.cpp
+@@ -71,12 +71,15 @@ MarkdownDocument *DiscountMarkdownConverter::createDocument(const QString &text,
+ markdownText.append('\n');
+ }
+
+- unsigned long converterOptions = translateConverterOptions(options);
++ mkd_flag_t *converterOptions = mkd_flags();
++
++ translateConverterOptions(options, converterOptions);
+
+ QByteArray utf8Data = markdownText.toUtf8();
+ doc = mkd_string(utf8Data, utf8Data.length(), converterOptions);
+
+ mkd_compile(doc, converterOptions);
++ mkd_free_flags(converterOptions);
+ }
+
+ return new DiscountMarkdownDocument(doc);
+@@ -136,44 +139,43 @@ MarkdownConverter::ConverterOptions DiscountMarkdownConverter::supportedOptions(
+ MarkdownConverter::NoSuperscriptOption;
+ }
+
+-unsigned long DiscountMarkdownConverter::translateConverterOptions(ConverterOptions options) const
++void DiscountMarkdownConverter::translateConverterOptions(ConverterOptions options, mkd_flag_t *flags) const
+ {
+- unsigned long converterOptions = MKD_TOC | MKD_NOSTYLE;
++ mkd_set_flag_num(flags, MKD_TOC);
++ mkd_set_flag_num(flags, MKD_NOSTYLE);
+
+ // autolink
+ if (options.testFlag(MarkdownConverter::AutolinkOption)) {
+- converterOptions |= MKD_AUTOLINK;
++ mkd_set_flag_num(flags, MKD_AUTOLINK);
+ }
+
+ // strikethrough
+ if (options.testFlag(MarkdownConverter::NoStrikethroughOption)) {
+- converterOptions |= MKD_NOSTRIKETHROUGH;
++ mkd_set_flag_num(flags, MKD_NOSTRIKETHROUGH);
+ }
+
+ // alphabetic lists
+ if (options.testFlag(MarkdownConverter::NoAlphaListOption)) {
+- converterOptions |= MKD_NOALPHALIST;
++ mkd_set_flag_num(flags, MKD_NOALPHALIST);
+ }
+
+ // definition lists
+ if (options.testFlag(MarkdownConverter::NoDefinitionListOption)) {
+- converterOptions |= MKD_NODLIST;
++ // converterOptions |= MKD_NODLIST;
+ }
+
+ // SmartyPants
+ if (options.testFlag(MarkdownConverter::NoSmartypantsOption)) {
+- converterOptions |= MKD_NOPANTS;
++ mkd_set_flag_num(flags, MKD_NOPANTS);
+ }
+
+ // Footnotes
+ if (options.testFlag(MarkdownConverter::ExtraFootnoteOption)) {
+- converterOptions |= MKD_EXTRA_FOOTNOTE;
++ mkd_set_flag_num(flags, MKD_EXTRA_FOOTNOTE);
+ }
+
+ // Superscript
+ if (options.testFlag(MarkdownConverter::NoSuperscriptOption)) {
+- converterOptions |= MKD_NOSUPERSCRIPT;
++ mkd_set_flag_num(flags, MKD_NOSUPERSCRIPT);
+ }
+-
+- return converterOptions;
+ }
+diff --git a/app-static/converter/discountmarkdownconverter.h b/app-static/converter/discountmarkdownconverter.h
+index 2902b5b..fd4c8e9 100644
+--- a/app-static/converter/discountmarkdownconverter.h
++++ b/app-static/converter/discountmarkdownconverter.h
+@@ -34,6 +34,8 @@
+
+ #include "markdownconverter.h"
+
++typedef void mkd_flag_t;
++
+ class DiscountMarkdownConverter : public MarkdownConverter
+ {
+ public:
+@@ -48,7 +50,7 @@ public:
+ virtual ConverterOptions supportedOptions() const;
+
+ private:
+- unsigned long translateConverterOptions(ConverterOptions options) const;
++ void translateConverterOptions(ConverterOptions options, mkd_flag_t *flags) const;
+ };
+
+ #endif // DISCOUNTMARKDOWNCONVERTER_H
+diff --git a/app/optionsdialog.cpp b/app/optionsdialog.cpp
+index 80452d1..e1f67a5 100644
+--- a/app/optionsdialog.cpp
++++ b/app/optionsdialog.cpp
+@@ -17,6 +17,7 @@
+ #include "optionsdialog.h"
+ #include "ui_optionsdialog.h"
+
++#include <QAction>
+ #include <QFontComboBox>
+ #include <QItemEditorFactory>
+ #include <QKeySequence>
diff --git a/srcpkgs/cutemarked/template b/srcpkgs/cutemarked/template
index 9723219bda6a40..e52d53a0b86ebe 100644
--- a/srcpkgs/cutemarked/template
+++ b/srcpkgs/cutemarked/template
@@ -2,7 +2,7 @@
pkgname=cutemarked
reverts="v0.11.0_1"
version=0.11.3
-revision=8
+revision=9
build_style=qmake
hostmakedepends="pkg-config qt5-qmake"
makedepends="qt5-devel qt5-tools-devel qt5-webkit-devel discount-devel hunspell-devel"
From c2db2fa05b04bca8c8f6c7000c44cacc7be60bc0 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 18:12:01 +0100
Subject: [PATCH 8/8] libpurple-mattermost: bump revision to update shlibs
---
srcpkgs/libpurple-mattermost/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libpurple-mattermost/template b/srcpkgs/libpurple-mattermost/template
index 81327a1165dfe9..67f2be262f769a 100644
--- a/srcpkgs/libpurple-mattermost/template
+++ b/srcpkgs/libpurple-mattermost/template
@@ -1,7 +1,7 @@
# Template file for 'libpurple-mattermost'
pkgname=libpurple-mattermost
version=1.2
-revision=1
+revision=2
build_style=gnu-makefile
hostmakedepends="pkg-config"
makedepends="libpurple-devel json-glib-devel libglib-devel discount-devel"
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] discount: update to 3.0.0d
2024-11-19 12:57 [PR PATCH] discount: update to 3.0.0d MIvanchev
` (8 preceding siblings ...)
2024-11-19 17:12 ` MIvanchev
@ 2024-11-19 17:31 ` MIvanchev
2024-11-19 18:37 ` MIvanchev
` (5 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: MIvanchev @ 2024-11-19 17:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages discount
https://github.com/void-linux/void-packages/pull/53142
discount: update to 3.0.0d
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
A patch file from https://github.com/void-linux/void-packages/pull/53142.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-discount-53142.patch --]
[-- Type: text/x-diff, Size: 12104 bytes --]
From 34d6940cc35dc18b87762f7321db8c6edc053a16 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 13:56:26 +0100
Subject: [PATCH 1/9] discount: bump common/shlibs
---
common/shlibs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/shlibs b/common/shlibs
index 381c6ef8bcc866..8503c3e4bb7729 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2793,7 +2793,7 @@ libsmpeg2-2.0.so.0 smpeg2-2.0.0_1
libedac.so.1 libedac-0.18_1
libxlsreader.so.8 libxls-1.6.1_1
libR.so R-4.0.2_1
-libmarkdown.so.2 discount-2.2.0_3
+libmarkdown.so.3 discount-3.0.0d_1
libkeystone.so.0 keystone-0.9_1
libmate-slab.so.0 libmate-control-center-1.14.0_2
libuev.so.3 libuev-2.4.0_1
From 0d25d317c5efb2318994f39cb7c213b80eafc22b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 13:51:11 +0100
Subject: [PATCH 2/9] discount: update to 3.0.0d
---
srcpkgs/discount/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/discount/template b/srcpkgs/discount/template
index d61cfffb8b41de..e8009d8a7a6e33 100644
--- a/srcpkgs/discount/template
+++ b/srcpkgs/discount/template
@@ -1,6 +1,6 @@
# Template file for 'discount'
pkgname=discount
-version=2.2.7d
+version=3.0.0d
revision=1
build_style=configure
configure_script="./configure.sh"
@@ -10,11 +10,11 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="http://www.pell.portland.or.us/~orc/Code/discount"
distfiles="https://github.com/Orc/discount/archive/v${version}.tar.gz"
-checksum=eb9f6629dadddb44c3111267b82e51d5fb8364e228cc3533fe937d8a99e0155b
+checksum=0ed8cc27ac5d46dc6a8beedd5e5673ac8b466a6474bdb7d35f37c815f670385f
disable_parallel_build=yes
do_install() {
- make DESTDIR=${DESTDIR} install install.man
+ make DESTDIR=${DESTDIR} install.everything
vlicense COPYRIGHT
}
discount-devel_package() {
From 04601d4004a1f37f7247f6802d1535a0ad8de4ff Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 14:05:52 +0100
Subject: [PATCH 3/9] Minder: bump revision to update shlibs
---
srcpkgs/Minder/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Minder/template b/srcpkgs/Minder/template
index c128c62552fae7..477da7ccb12da9 100644
--- a/srcpkgs/Minder/template
+++ b/srcpkgs/Minder/template
@@ -1,7 +1,7 @@
# Template file for 'Minder'
pkgname=Minder
version=1.14.0
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext glib-devel vala"
makedepends="cairo-devel granite-devel gtk+3-devel libxml2-devel libgee08-devel
From 73e5d37f66f61cf22c02288eb8c89f621e1eadb3 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 14:06:27 +0100
Subject: [PATCH 4/9] kdepim-addons: bump revision to update shlibs
---
srcpkgs/kdepim-addons/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kdepim-addons/template b/srcpkgs/kdepim-addons/template
index 4334bf98c66b07..14e17d68e0d60b 100644
--- a/srcpkgs/kdepim-addons/template
+++ b/srcpkgs/kdepim-addons/template
@@ -1,7 +1,7 @@
# Template file for 'kdepim-addons'
pkgname=kdepim-addons
version=24.08.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From abe3b30fb758c106c0706a7189bbbec8425f0361 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 14:06:41 +0100
Subject: [PATCH 5/9] notes-up: bump revision to update shlibs
---
srcpkgs/notes-up/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/notes-up/template b/srcpkgs/notes-up/template
index 43e621cbdb66da..715d777a39bbe3 100644
--- a/srcpkgs/notes-up/template
+++ b/srcpkgs/notes-up/template
@@ -1,7 +1,7 @@
# Template file for 'notes-up'
pkgname=notes-up
version=2.0.6
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config vala gettext glib-devel"
makedepends="libgee08-devel discount-devel libwebkit2gtk41-devel granite-devel
From b43cf8c0374ff574de4b2048d5bf9d453fb12d54 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 14:07:07 +0100
Subject: [PATCH 6/9] okular: bump revision to update shlibs
---
srcpkgs/okular/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 979057cee0566a..d0a4eaaabe6a40 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,7 +1,7 @@
# Template file for 'okular'
pkgname=okular
version=24.08.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 9b84fe289bb24a9cb0e255621f10b84eaa0f5ace Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 14:06:04 +0100
Subject: [PATCH 7/9] cutemarked: bump revision to update shlibs
---
srcpkgs/cutemarked/patches/QAction.patch | 10 --
.../cutemarked/patches/compatibilities.patch | 110 ++++++++++++++++++
srcpkgs/cutemarked/template | 2 +-
3 files changed, 111 insertions(+), 11 deletions(-)
delete mode 100644 srcpkgs/cutemarked/patches/QAction.patch
create mode 100644 srcpkgs/cutemarked/patches/compatibilities.patch
diff --git a/srcpkgs/cutemarked/patches/QAction.patch b/srcpkgs/cutemarked/patches/QAction.patch
deleted file mode 100644
index c2fb7bef108911..00000000000000
--- a/srcpkgs/cutemarked/patches/QAction.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/app/optionsdialog.cpp 2016-03-28 13:48:50.000000000 +0200
-+++ b/app/optionsdialog.cpp 2016-03-28 13:48:50.000000000 +0200
-@@ -17,6 +17,7 @@
- #include "optionsdialog.h"
- #include "ui_optionsdialog.h"
-
-+#include <QAction>
- #include <QFontComboBox>
- #include <QItemEditorFactory>
- #include <QKeySequence>
diff --git a/srcpkgs/cutemarked/patches/compatibilities.patch b/srcpkgs/cutemarked/patches/compatibilities.patch
new file mode 100644
index 00000000000000..9121e6f2466bf4
--- /dev/null
+++ b/srcpkgs/cutemarked/patches/compatibilities.patch
@@ -0,0 +1,110 @@
+diff --git a/app-static/converter/discountmarkdownconverter.cpp b/app-static/converter/discountmarkdownconverter.cpp
+index be8715a..702ab3b 100644
+--- a/app-static/converter/discountmarkdownconverter.cpp
++++ b/app-static/converter/discountmarkdownconverter.cpp
+@@ -71,12 +71,15 @@ MarkdownDocument *DiscountMarkdownConverter::createDocument(const QString &text,
+ markdownText.append('\n');
+ }
+
+- unsigned long converterOptions = translateConverterOptions(options);
++ mkd_flag_t *converterOptions = mkd_flags();
++
++ translateConverterOptions(options, converterOptions);
+
+ QByteArray utf8Data = markdownText.toUtf8();
+ doc = mkd_string(utf8Data, utf8Data.length(), converterOptions);
+
+ mkd_compile(doc, converterOptions);
++ mkd_free_flags(converterOptions);
+ }
+
+ return new DiscountMarkdownDocument(doc);
+@@ -136,44 +139,43 @@ MarkdownConverter::ConverterOptions DiscountMarkdownConverter::supportedOptions(
+ MarkdownConverter::NoSuperscriptOption;
+ }
+
+-unsigned long DiscountMarkdownConverter::translateConverterOptions(ConverterOptions options) const
++void DiscountMarkdownConverter::translateConverterOptions(ConverterOptions options, mkd_flag_t *flags) const
+ {
+- unsigned long converterOptions = MKD_TOC | MKD_NOSTYLE;
++ mkd_set_flag_num(flags, MKD_TOC);
++ mkd_set_flag_num(flags, MKD_NOSTYLE);
+
+ // autolink
+ if (options.testFlag(MarkdownConverter::AutolinkOption)) {
+- converterOptions |= MKD_AUTOLINK;
++ mkd_set_flag_num(flags, MKD_AUTOLINK);
+ }
+
+ // strikethrough
+ if (options.testFlag(MarkdownConverter::NoStrikethroughOption)) {
+- converterOptions |= MKD_NOSTRIKETHROUGH;
++ mkd_set_flag_num(flags, MKD_NOSTRIKETHROUGH);
+ }
+
+ // alphabetic lists
+ if (options.testFlag(MarkdownConverter::NoAlphaListOption)) {
+- converterOptions |= MKD_NOALPHALIST;
++ mkd_set_flag_num(flags, MKD_NOALPHALIST);
+ }
+
+ // definition lists
+ if (options.testFlag(MarkdownConverter::NoDefinitionListOption)) {
+- converterOptions |= MKD_NODLIST;
++ // converterOptions |= MKD_NODLIST;
+ }
+
+ // SmartyPants
+ if (options.testFlag(MarkdownConverter::NoSmartypantsOption)) {
+- converterOptions |= MKD_NOPANTS;
++ mkd_set_flag_num(flags, MKD_NOPANTS);
+ }
+
+ // Footnotes
+ if (options.testFlag(MarkdownConverter::ExtraFootnoteOption)) {
+- converterOptions |= MKD_EXTRA_FOOTNOTE;
++ mkd_set_flag_num(flags, MKD_EXTRA_FOOTNOTE);
+ }
+
+ // Superscript
+ if (options.testFlag(MarkdownConverter::NoSuperscriptOption)) {
+- converterOptions |= MKD_NOSUPERSCRIPT;
++ mkd_set_flag_num(flags, MKD_NOSUPERSCRIPT);
+ }
+-
+- return converterOptions;
+ }
+diff --git a/app-static/converter/discountmarkdownconverter.h b/app-static/converter/discountmarkdownconverter.h
+index 2902b5b..fd4c8e9 100644
+--- a/app-static/converter/discountmarkdownconverter.h
++++ b/app-static/converter/discountmarkdownconverter.h
+@@ -34,6 +34,8 @@
+
+ #include "markdownconverter.h"
+
++typedef void mkd_flag_t;
++
+ class DiscountMarkdownConverter : public MarkdownConverter
+ {
+ public:
+@@ -48,7 +50,7 @@ public:
+ virtual ConverterOptions supportedOptions() const;
+
+ private:
+- unsigned long translateConverterOptions(ConverterOptions options) const;
++ void translateConverterOptions(ConverterOptions options, mkd_flag_t *flags) const;
+ };
+
+ #endif // DISCOUNTMARKDOWNCONVERTER_H
+diff --git a/app/optionsdialog.cpp b/app/optionsdialog.cpp
+index 80452d1..e1f67a5 100644
+--- a/app/optionsdialog.cpp
++++ b/app/optionsdialog.cpp
+@@ -17,6 +17,7 @@
+ #include "optionsdialog.h"
+ #include "ui_optionsdialog.h"
+
++#include <QAction>
+ #include <QFontComboBox>
+ #include <QItemEditorFactory>
+ #include <QKeySequence>
diff --git a/srcpkgs/cutemarked/template b/srcpkgs/cutemarked/template
index 9723219bda6a40..e52d53a0b86ebe 100644
--- a/srcpkgs/cutemarked/template
+++ b/srcpkgs/cutemarked/template
@@ -2,7 +2,7 @@
pkgname=cutemarked
reverts="v0.11.0_1"
version=0.11.3
-revision=8
+revision=9
build_style=qmake
hostmakedepends="pkg-config qt5-qmake"
makedepends="qt5-devel qt5-tools-devel qt5-webkit-devel discount-devel hunspell-devel"
From c2db2fa05b04bca8c8f6c7000c44cacc7be60bc0 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 18:12:01 +0100
Subject: [PATCH 8/9] libpurple-mattermost: bump revision to update shlibs
---
srcpkgs/libpurple-mattermost/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libpurple-mattermost/template b/srcpkgs/libpurple-mattermost/template
index 81327a1165dfe9..67f2be262f769a 100644
--- a/srcpkgs/libpurple-mattermost/template
+++ b/srcpkgs/libpurple-mattermost/template
@@ -1,7 +1,7 @@
# Template file for 'libpurple-mattermost'
pkgname=libpurple-mattermost
version=1.2
-revision=1
+revision=2
build_style=gnu-makefile
hostmakedepends="pkg-config"
makedepends="libpurple-devel json-glib-devel libglib-devel discount-devel"
From 3ee2661c156a142d23978cf06fbb921a75ebdcf0 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 18:31:17 +0100
Subject: [PATCH 9/9] pdfpc: bump revision to update shlibs
---
srcpkgs/pdfpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pdfpc/template b/srcpkgs/pdfpc/template
index c5eff73cd6fabd..ba848dcc6dd9a6 100644
--- a/srcpkgs/pdfpc/template
+++ b/srcpkgs/pdfpc/template
@@ -1,7 +1,7 @@
# Template file for 'pdfpc'
pkgname=pdfpc
version=4.6.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DREST=OFF"
hostmakedepends="pkg-config vala libgee08-devel"
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] discount: update to 3.0.0d
2024-11-19 12:57 [PR PATCH] discount: update to 3.0.0d MIvanchev
` (9 preceding siblings ...)
2024-11-19 17:31 ` MIvanchev
@ 2024-11-19 18:37 ` MIvanchev
2024-11-19 21:22 ` MIvanchev
` (4 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: MIvanchev @ 2024-11-19 18:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages discount
https://github.com/void-linux/void-packages/pull/53142
discount: update to 3.0.0d
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
A patch file from https://github.com/void-linux/void-packages/pull/53142.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-discount-53142.patch --]
[-- Type: text/x-diff, Size: 13798 bytes --]
From 34d6940cc35dc18b87762f7321db8c6edc053a16 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 13:56:26 +0100
Subject: [PATCH 1/9] discount: bump common/shlibs
---
common/shlibs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/shlibs b/common/shlibs
index 381c6ef8bcc866..8503c3e4bb7729 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2793,7 +2793,7 @@ libsmpeg2-2.0.so.0 smpeg2-2.0.0_1
libedac.so.1 libedac-0.18_1
libxlsreader.so.8 libxls-1.6.1_1
libR.so R-4.0.2_1
-libmarkdown.so.2 discount-2.2.0_3
+libmarkdown.so.3 discount-3.0.0d_1
libkeystone.so.0 keystone-0.9_1
libmate-slab.so.0 libmate-control-center-1.14.0_2
libuev.so.3 libuev-2.4.0_1
From 0d25d317c5efb2318994f39cb7c213b80eafc22b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 13:51:11 +0100
Subject: [PATCH 2/9] discount: update to 3.0.0d
---
srcpkgs/discount/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/discount/template b/srcpkgs/discount/template
index d61cfffb8b41de..e8009d8a7a6e33 100644
--- a/srcpkgs/discount/template
+++ b/srcpkgs/discount/template
@@ -1,6 +1,6 @@
# Template file for 'discount'
pkgname=discount
-version=2.2.7d
+version=3.0.0d
revision=1
build_style=configure
configure_script="./configure.sh"
@@ -10,11 +10,11 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="http://www.pell.portland.or.us/~orc/Code/discount"
distfiles="https://github.com/Orc/discount/archive/v${version}.tar.gz"
-checksum=eb9f6629dadddb44c3111267b82e51d5fb8364e228cc3533fe937d8a99e0155b
+checksum=0ed8cc27ac5d46dc6a8beedd5e5673ac8b466a6474bdb7d35f37c815f670385f
disable_parallel_build=yes
do_install() {
- make DESTDIR=${DESTDIR} install install.man
+ make DESTDIR=${DESTDIR} install.everything
vlicense COPYRIGHT
}
discount-devel_package() {
From 04601d4004a1f37f7247f6802d1535a0ad8de4ff Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 14:05:52 +0100
Subject: [PATCH 3/9] Minder: bump revision to update shlibs
---
srcpkgs/Minder/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Minder/template b/srcpkgs/Minder/template
index c128c62552fae7..477da7ccb12da9 100644
--- a/srcpkgs/Minder/template
+++ b/srcpkgs/Minder/template
@@ -1,7 +1,7 @@
# Template file for 'Minder'
pkgname=Minder
version=1.14.0
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext glib-devel vala"
makedepends="cairo-devel granite-devel gtk+3-devel libxml2-devel libgee08-devel
From 73e5d37f66f61cf22c02288eb8c89f621e1eadb3 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 14:06:27 +0100
Subject: [PATCH 4/9] kdepim-addons: bump revision to update shlibs
---
srcpkgs/kdepim-addons/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kdepim-addons/template b/srcpkgs/kdepim-addons/template
index 4334bf98c66b07..14e17d68e0d60b 100644
--- a/srcpkgs/kdepim-addons/template
+++ b/srcpkgs/kdepim-addons/template
@@ -1,7 +1,7 @@
# Template file for 'kdepim-addons'
pkgname=kdepim-addons
version=24.08.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From abe3b30fb758c106c0706a7189bbbec8425f0361 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 14:06:41 +0100
Subject: [PATCH 5/9] notes-up: bump revision to update shlibs
---
srcpkgs/notes-up/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/notes-up/template b/srcpkgs/notes-up/template
index 43e621cbdb66da..715d777a39bbe3 100644
--- a/srcpkgs/notes-up/template
+++ b/srcpkgs/notes-up/template
@@ -1,7 +1,7 @@
# Template file for 'notes-up'
pkgname=notes-up
version=2.0.6
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config vala gettext glib-devel"
makedepends="libgee08-devel discount-devel libwebkit2gtk41-devel granite-devel
From b43cf8c0374ff574de4b2048d5bf9d453fb12d54 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 14:07:07 +0100
Subject: [PATCH 6/9] okular: bump revision to update shlibs
---
srcpkgs/okular/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 979057cee0566a..d0a4eaaabe6a40 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,7 +1,7 @@
# Template file for 'okular'
pkgname=okular
version=24.08.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 9b84fe289bb24a9cb0e255621f10b84eaa0f5ace Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 14:06:04 +0100
Subject: [PATCH 7/9] cutemarked: bump revision to update shlibs
---
srcpkgs/cutemarked/patches/QAction.patch | 10 --
.../cutemarked/patches/compatibilities.patch | 110 ++++++++++++++++++
srcpkgs/cutemarked/template | 2 +-
3 files changed, 111 insertions(+), 11 deletions(-)
delete mode 100644 srcpkgs/cutemarked/patches/QAction.patch
create mode 100644 srcpkgs/cutemarked/patches/compatibilities.patch
diff --git a/srcpkgs/cutemarked/patches/QAction.patch b/srcpkgs/cutemarked/patches/QAction.patch
deleted file mode 100644
index c2fb7bef108911..00000000000000
--- a/srcpkgs/cutemarked/patches/QAction.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/app/optionsdialog.cpp 2016-03-28 13:48:50.000000000 +0200
-+++ b/app/optionsdialog.cpp 2016-03-28 13:48:50.000000000 +0200
-@@ -17,6 +17,7 @@
- #include "optionsdialog.h"
- #include "ui_optionsdialog.h"
-
-+#include <QAction>
- #include <QFontComboBox>
- #include <QItemEditorFactory>
- #include <QKeySequence>
diff --git a/srcpkgs/cutemarked/patches/compatibilities.patch b/srcpkgs/cutemarked/patches/compatibilities.patch
new file mode 100644
index 00000000000000..9121e6f2466bf4
--- /dev/null
+++ b/srcpkgs/cutemarked/patches/compatibilities.patch
@@ -0,0 +1,110 @@
+diff --git a/app-static/converter/discountmarkdownconverter.cpp b/app-static/converter/discountmarkdownconverter.cpp
+index be8715a..702ab3b 100644
+--- a/app-static/converter/discountmarkdownconverter.cpp
++++ b/app-static/converter/discountmarkdownconverter.cpp
+@@ -71,12 +71,15 @@ MarkdownDocument *DiscountMarkdownConverter::createDocument(const QString &text,
+ markdownText.append('\n');
+ }
+
+- unsigned long converterOptions = translateConverterOptions(options);
++ mkd_flag_t *converterOptions = mkd_flags();
++
++ translateConverterOptions(options, converterOptions);
+
+ QByteArray utf8Data = markdownText.toUtf8();
+ doc = mkd_string(utf8Data, utf8Data.length(), converterOptions);
+
+ mkd_compile(doc, converterOptions);
++ mkd_free_flags(converterOptions);
+ }
+
+ return new DiscountMarkdownDocument(doc);
+@@ -136,44 +139,43 @@ MarkdownConverter::ConverterOptions DiscountMarkdownConverter::supportedOptions(
+ MarkdownConverter::NoSuperscriptOption;
+ }
+
+-unsigned long DiscountMarkdownConverter::translateConverterOptions(ConverterOptions options) const
++void DiscountMarkdownConverter::translateConverterOptions(ConverterOptions options, mkd_flag_t *flags) const
+ {
+- unsigned long converterOptions = MKD_TOC | MKD_NOSTYLE;
++ mkd_set_flag_num(flags, MKD_TOC);
++ mkd_set_flag_num(flags, MKD_NOSTYLE);
+
+ // autolink
+ if (options.testFlag(MarkdownConverter::AutolinkOption)) {
+- converterOptions |= MKD_AUTOLINK;
++ mkd_set_flag_num(flags, MKD_AUTOLINK);
+ }
+
+ // strikethrough
+ if (options.testFlag(MarkdownConverter::NoStrikethroughOption)) {
+- converterOptions |= MKD_NOSTRIKETHROUGH;
++ mkd_set_flag_num(flags, MKD_NOSTRIKETHROUGH);
+ }
+
+ // alphabetic lists
+ if (options.testFlag(MarkdownConverter::NoAlphaListOption)) {
+- converterOptions |= MKD_NOALPHALIST;
++ mkd_set_flag_num(flags, MKD_NOALPHALIST);
+ }
+
+ // definition lists
+ if (options.testFlag(MarkdownConverter::NoDefinitionListOption)) {
+- converterOptions |= MKD_NODLIST;
++ // converterOptions |= MKD_NODLIST;
+ }
+
+ // SmartyPants
+ if (options.testFlag(MarkdownConverter::NoSmartypantsOption)) {
+- converterOptions |= MKD_NOPANTS;
++ mkd_set_flag_num(flags, MKD_NOPANTS);
+ }
+
+ // Footnotes
+ if (options.testFlag(MarkdownConverter::ExtraFootnoteOption)) {
+- converterOptions |= MKD_EXTRA_FOOTNOTE;
++ mkd_set_flag_num(flags, MKD_EXTRA_FOOTNOTE);
+ }
+
+ // Superscript
+ if (options.testFlag(MarkdownConverter::NoSuperscriptOption)) {
+- converterOptions |= MKD_NOSUPERSCRIPT;
++ mkd_set_flag_num(flags, MKD_NOSUPERSCRIPT);
+ }
+-
+- return converterOptions;
+ }
+diff --git a/app-static/converter/discountmarkdownconverter.h b/app-static/converter/discountmarkdownconverter.h
+index 2902b5b..fd4c8e9 100644
+--- a/app-static/converter/discountmarkdownconverter.h
++++ b/app-static/converter/discountmarkdownconverter.h
+@@ -34,6 +34,8 @@
+
+ #include "markdownconverter.h"
+
++typedef void mkd_flag_t;
++
+ class DiscountMarkdownConverter : public MarkdownConverter
+ {
+ public:
+@@ -48,7 +50,7 @@ public:
+ virtual ConverterOptions supportedOptions() const;
+
+ private:
+- unsigned long translateConverterOptions(ConverterOptions options) const;
++ void translateConverterOptions(ConverterOptions options, mkd_flag_t *flags) const;
+ };
+
+ #endif // DISCOUNTMARKDOWNCONVERTER_H
+diff --git a/app/optionsdialog.cpp b/app/optionsdialog.cpp
+index 80452d1..e1f67a5 100644
+--- a/app/optionsdialog.cpp
++++ b/app/optionsdialog.cpp
+@@ -17,6 +17,7 @@
+ #include "optionsdialog.h"
+ #include "ui_optionsdialog.h"
+
++#include <QAction>
+ #include <QFontComboBox>
+ #include <QItemEditorFactory>
+ #include <QKeySequence>
diff --git a/srcpkgs/cutemarked/template b/srcpkgs/cutemarked/template
index 9723219bda6a40..e52d53a0b86ebe 100644
--- a/srcpkgs/cutemarked/template
+++ b/srcpkgs/cutemarked/template
@@ -2,7 +2,7 @@
pkgname=cutemarked
reverts="v0.11.0_1"
version=0.11.3
-revision=8
+revision=9
build_style=qmake
hostmakedepends="pkg-config qt5-qmake"
makedepends="qt5-devel qt5-tools-devel qt5-webkit-devel discount-devel hunspell-devel"
From c2db2fa05b04bca8c8f6c7000c44cacc7be60bc0 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 18:12:01 +0100
Subject: [PATCH 8/9] libpurple-mattermost: bump revision to update shlibs
---
srcpkgs/libpurple-mattermost/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libpurple-mattermost/template b/srcpkgs/libpurple-mattermost/template
index 81327a1165dfe9..67f2be262f769a 100644
--- a/srcpkgs/libpurple-mattermost/template
+++ b/srcpkgs/libpurple-mattermost/template
@@ -1,7 +1,7 @@
# Template file for 'libpurple-mattermost'
pkgname=libpurple-mattermost
version=1.2
-revision=1
+revision=2
build_style=gnu-makefile
hostmakedepends="pkg-config"
makedepends="libpurple-devel json-glib-devel libglib-devel discount-devel"
From 910d429abf0ba05eabeff621169d7328964f0adb Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Tue, 19 Nov 2024 18:31:17 +0100
Subject: [PATCH 9/9] pdfpc: bump revision to update shlibs
---
srcpkgs/pdfpc/patches/discount-v3.patch | 39 +++++++++++++++++++++++++
srcpkgs/pdfpc/template | 2 +-
2 files changed, 40 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/pdfpc/patches/discount-v3.patch
diff --git a/srcpkgs/pdfpc/patches/discount-v3.patch b/srcpkgs/pdfpc/patches/discount-v3.patch
new file mode 100644
index 00000000000000..2ffb4b9286752a
--- /dev/null
+++ b/srcpkgs/pdfpc/patches/discount-v3.patch
@@ -0,0 +1,39 @@
+diff --git a/src/classes/renderer/markdown.vala b/src/classes/renderer/markdown.vala
+index 3964af8..c77e787 100644
+--- a/src/classes/renderer/markdown.vala
++++ b/src/classes/renderer/markdown.vala
+@@ -23,7 +23,8 @@
+ namespace pdfpc.Renderer {
+ public class MD {
+ public static string render(string? text = "", bool plain_text = false) {
+- Markdown.DocumentFlags flags = Markdown.DocumentFlags.NO_EXT;
++ var flags = new Markdown.DocumentFlags();
++ flags.set(Markdown.DocumentFlag.NO_EXT);
+
+ string html;
+ if (text != "" && plain_text) {
+diff --git a/src/libmarkdown.vapi b/src/libmarkdown.vapi
+index f762f17..33ea775 100644
+--- a/src/libmarkdown.vapi
++++ b/src/libmarkdown.vapi
+@@ -95,9 +95,17 @@ namespace Markdown
+ public void ref_prefix (string prefix);
+ }
+
+- [Flags]
+- [CCode (cname = "mkd_flag_t", cprefix = "MKD_")]
+- public enum DocumentFlags
++ [Compact]
++ [CCode (cname = "mkd_flag_t", free_function = "mkd_free_flags")]
++ public class DocumentFlags {
++ [CCode (cname = "mkd_flags")]
++ public DocumentFlags();
++ [CCode (cname = "mkd_set_flag_num")]
++ public void set (DocumentFlag flag);
++ }
++
++ [CCode (cprefix = "MKD_")]
++ public enum DocumentFlag
+ {
+ NOLINKS,
+ NOIMAGE,
diff --git a/srcpkgs/pdfpc/template b/srcpkgs/pdfpc/template
index c5eff73cd6fabd..ba848dcc6dd9a6 100644
--- a/srcpkgs/pdfpc/template
+++ b/srcpkgs/pdfpc/template
@@ -1,7 +1,7 @@
# Template file for 'pdfpc'
pkgname=pdfpc
version=4.6.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DREST=OFF"
hostmakedepends="pkg-config vala libgee08-devel"
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: discount: update to 3.0.0d
2024-11-19 12:57 [PR PATCH] discount: update to 3.0.0d MIvanchev
` (10 preceding siblings ...)
2024-11-19 18:37 ` MIvanchev
@ 2024-11-19 21:22 ` MIvanchev
2024-11-19 21:22 ` MIvanchev
` (3 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: MIvanchev @ 2024-11-19 21:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 257 bytes --]
New comment by MIvanchev on void-packages repository
https://github.com/void-linux/void-packages/pull/53142#issuecomment-2486778794
Comment:
@leahneukirchen Do you have an idea about `libokular5-23.08.5_1: broken, unresolvable shlib `libmarkdown.so.2'` ?
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: discount: update to 3.0.0d
2024-11-19 12:57 [PR PATCH] discount: update to 3.0.0d MIvanchev
` (11 preceding siblings ...)
2024-11-19 21:22 ` MIvanchev
@ 2024-11-19 21:22 ` MIvanchev
2024-11-19 21:22 ` MIvanchev
` (2 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: MIvanchev @ 2024-11-19 21:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 265 bytes --]
New comment by MIvanchev on void-packages repository
https://github.com/void-linux/void-packages/pull/53142#issuecomment-2486778794
Comment:
@leahneukirchen Do you have an idea about
```
ibokular5-23.08.5_1: broken, unresolvable shlib `libmarkdown.so.2'
```
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: discount: update to 3.0.0d
2024-11-19 12:57 [PR PATCH] discount: update to 3.0.0d MIvanchev
` (12 preceding siblings ...)
2024-11-19 21:22 ` MIvanchev
@ 2024-11-19 21:22 ` MIvanchev
2024-11-20 13:35 ` leahneukirchen
2024-11-20 17:53 ` [PR PATCH] [Merged]: " leahneukirchen
15 siblings, 0 replies; 17+ messages in thread
From: MIvanchev @ 2024-11-19 21:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 266 bytes --]
New comment by MIvanchev on void-packages repository
https://github.com/void-linux/void-packages/pull/53142#issuecomment-2486778794
Comment:
@leahneukirchen Do you have an idea about
```
libokular5-23.08.5_1: broken, unresolvable shlib `libmarkdown.so.2'
```
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: discount: update to 3.0.0d
2024-11-19 12:57 [PR PATCH] discount: update to 3.0.0d MIvanchev
` (13 preceding siblings ...)
2024-11-19 21:22 ` MIvanchev
@ 2024-11-20 13:35 ` leahneukirchen
2024-11-20 17:53 ` [PR PATCH] [Merged]: " leahneukirchen
15 siblings, 0 replies; 17+ messages in thread
From: leahneukirchen @ 2024-11-20 13:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 274 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/53142#issuecomment-2488606876
Comment:
That's an obsolete package we need to remove from the builders.
Else LGTM, I'll merge when this issue is resolved. Thanks!
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Merged]: discount: update to 3.0.0d
2024-11-19 12:57 [PR PATCH] discount: update to 3.0.0d MIvanchev
` (14 preceding siblings ...)
2024-11-20 13:35 ` leahneukirchen
@ 2024-11-20 17:53 ` leahneukirchen
15 siblings, 0 replies; 17+ messages in thread
From: leahneukirchen @ 2024-11-20 17:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 328 bytes --]
There's a merged pull request on the void-packages repository
discount: update to 3.0.0d
https://github.com/void-linux/void-packages/pull/53142
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
^ permalink raw reply [flat|nested] 17+ messages in thread