On Thu, 22 Aug 2024 15:44:39 +0100
Stuart Henderson <s...@spacehopper.org> wrote:
>
> The patch filename should have changed
>
> make patch
> rm patches/patch-dooble_desktop
> make update-patches
>
Oops! Sorry. Here's a fixed diff.
This good?
--
-iz (they/them)
> i like to say mundane things,
> there are too many uninteresting things
> that go unnoticed.
izder456 (dot) neocities (dot) org
diff --git Makefile Makefile
index 946f5ede5..9159e92e2 100755
--- Makefile
+++ Makefile
@@ -3,9 +3,8 @@ USE_WXNEEDED = Yes
COMMENT = small, lightweight QtWebEngine web browser
CATEGORIES = www x11
-GH_ACCOUNT = textbrowser
-GH_PROJECT = dooble
-GH_TAGNAME = 2023.07.15
+V = 2024.08.20
+DIST_TUPLE += github textbrowser dooble ${V} .
HOMEPAGE = https://textbrowser.github.io/dooble/
MAINTAINER = Brian Callahan <bcal...@openbsd.org>
@@ -40,7 +39,7 @@ NO_TEST = Yes
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/Dooble ${PREFIX}/bin/dooble
${INSTALL_DATA_DIR} ${PREFIX}/share/applications
- ${SUBST_CMD} -c ${WRKSRC}/dooble.desktop \
+ ${SUBST_CMD} -c ${WRKSRC}/Distributions/dooble.desktop \
${PREFIX}/share/applications/dooble.desktop
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
${INSTALL_DATA} ${WRKSRC}/Icons/Logo/dooble.png \
diff --git distinfo distinfo
index 5d8d0348f..105d1c7f1 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (dooble-2023.07.15.tar.gz) = yO7TYNlA1yS/I9vHotukpTMSvZey1WO3evAnoiB5qU4=
-SIZE (dooble-2023.07.15.tar.gz) = 90240040
+SHA256 (textbrowser-dooble-2024.08.20.tar.gz) = 26zWrfdilkmDoZQ0ls1DXqnkzyaVaBQdhaPBLWesvB4=
+SIZE (textbrowser-dooble-2024.08.20.tar.gz) = 42755735
diff --git patches/patch-Distributions_dooble_desktop patches/patch-Distributions_dooble_desktop
index 324deb82b..c9e664157 100644
--- patches/patch-Distributions_dooble_desktop
+++ patches/patch-Distributions_dooble_desktop
@@ -1,5 +1,3 @@
-Make sure Exec points to the correct place.
-
Index: Distributions/dooble.desktop
--- Distributions/dooble.desktop.orig
+++ Distributions/dooble.desktop
@@ -11,4 +9,4 @@ Index: Distributions/dooble.desktop
+Exec=${TRUEPREFIX}/bin/dooble
GenericName=Dooble Web Browser
Icon=dooble
- Name=Dooble Web Browser
+ MimeType=text/html;application/xhtml+xml;x-scheme-handler/file;x-scheme-handler/ftp;x-scheme-handler/gopher;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/jar;
diff --git patches/patch-dooble_desktop patches/patch-dooble_desktop
deleted file mode 100644
index 7a38b8e69..000000000
--- patches/patch-dooble_desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-Make sure Exec points to the correct place.
-
-Index: dooble.desktop
---- dooble.desktop.orig
-+++ dooble.desktop
-@@ -3,7 +3,7 @@
- [Desktop Entry]
- Categories=Network;WebBrowser;
- Comment=Dooble Web Browser
--Exec=/usr/bin/dooble
-+Exec=${TRUEPREFIX}/bin/dooble
- GenericName=Dooble Web Browser
- Icon=dooble
- Name=Dooble Web Browser
diff --git patches/patch-dooble_pro patches/patch-dooble_pro
index 8c9dd0682..d32d91849 100644
--- patches/patch-dooble_pro
+++ patches/patch-dooble_pro
@@ -3,7 +3,7 @@ Remove -O3 and -Werror.
Index: dooble.pro
--- dooble.pro.orig
+++ dooble.pro
-@@ -305,13 +305,12 @@ versionAtLeast(QT_VERSION, 6.0.0) {
+@@ -314,13 +314,12 @@ versionAtLeast(QT_VERSION, 6.0.0) {
QMAKE_LFLAGS += /entry:mainCRTStartup
}
} else {
@@ -18,7 +18,7 @@ Index: dooble.pro
-Wextra \
-Wformat-overflow=2 \
-Wformat-security \
-@@ -342,7 +341,6 @@ QMAKE_CXXFLAGS_RELEASE += -Wl,-z,relro \
+@@ -356,7 +355,6 @@ QMAKE_CXXFLAGS_RELEASE += -Wl,-z,relro \
versionAtLeast(QT_VERSION, 6.0.0) {
QMAKE_CXXFLAGS_RELEASE += -Wno-int-in-bool-context
}
