I just rebuilt everything from scratch in a clean directory with no issue.
I won't make such a disruptive change unless several other people complain of this problem, because I can't reproduce it.
Even then, I'll try to contact upstream first.
Git Clone URL: | https://aur.archlinux.org/gourou-git.git (read-only, click to copy) |
---|---|
Package Base: | gourou-git |
Description: | Download and decrypt adobe encrypted (acsm) pdf and epub files (git version) |
Upstream URL: | https://forge.soutade.fr/soutade/libgourou |
Keywords: | acsm adobe ebook libby overdrive |
Licenses: | LGPL3 |
Conflicts: | gourou, gourou-bin |
Provides: | gourou, libgourou |
Submitter: | vcalv |
Maintainer: | vcalv |
Last Packager: | vcalv |
Votes: | 1 |
Popularity: | 0.000002 |
First Submitted: | 2022-10-14 04:52 (UTC) |
Last Updated: | 2024-09-28 20:25 (UTC) |
I just rebuilt everything from scratch in a clean directory with no issue.
I won't make such a disruptive change unless several other people complain of this problem, because I can't reproduce it.
Even then, I'll try to contact upstream first.
SSH clone requires authentication, so I propose the following change:
From 6dcfe62a6192f207d1d340a3834a0da4e9daebee Mon Sep 17 00:00:00 2001
From: asm0dey <pavel.finkelshtein@gmail.com>
Date: Sun, 4 Jun 2023 10:59:51 +0200
Subject: [PATCH] Download zip of the repo instead of cloning it
---
PKGBUILD | 24 ++++++++++++------------
build.patch | 4 ++--
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/PKGBUILD b/PKGBUILD
index 32c9695..3e163bd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
_pkgname=gourou
pkgname="${_pkgname}-git"
-pkgver=r121.46afe77
-pkgrel=4
+pkgver=r7.331a285
+pkgrel=1
pkgdesc="Download and decrypt adobe encrypted (acsm) pdf and epub files (git version)"
arch=('x86_64')
license=('LGPL3')
@@ -11,16 +11,16 @@ conflicts=(gourou gourou-bin)
provides=("gourou" "libgourou")
options=(strip)
source=(
- "git://soutade.fr/libgourou.git"
- "git://soutade.fr/updfparser.git"
+ "libgorou.zip::https://indefero.soutade.fr/p/libgourou/source/download/master/"
+ "updfparser.zip::https://indefero.soutade.fr/p/updfparser/source/download/master/"
"build.patch")
-sha512sums=('SKIP'
- 'SKIP'
- '768e49fddcabe8b4c6f771ebbddf2618ab59e7b1a399d99aa9a9881f932e092210878ef576144593684b4c3a763218c5b546dbe19fdbadeff13995245bffda19')
+sha512sums=('f16df3d80ef1a99bb3aa8137755b1168ac56df41aac9da9fcf26483345c4d2f835e39cf87c116c0d2704f16ec15b4610f547634642205c702f5d1c8a43d5c8f8'
+ '2f0398dbc41cf4c0df79ca8621efe4098a67533ddd9ec87cceb64d14f1255a1e92ce1c7a951e9f5fedc561f842456149b28b545cca01d63ca250b941621fc176'
+ '7b1c638e11e3b5b4191645a81e7f9469d1a58f271779b31f1307123155fc9da4ba0eff8e406e836e6a5c981f6339f8dda669df29fda363c23d7eb46d0ace4561')
pkgver() {
- cd "libgourou"
+ cd "libgourou-master"
( set -o pipefail
git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@@ -28,7 +28,7 @@ pkgver() {
}
prepare(){
- cd libgourou
+ cd libgourou-master
for patch in build; do
patch --forward --strip=1 --input="../$patch.patch"
done
@@ -36,14 +36,14 @@ prepare(){
build(){
- cd updfparser
+ cd updfparser-master
make BUILD_STATIC=1 BUILD_SHARED=0
- cd ../libgourou
+ cd ../libgourou-master
make PWD=`pwd` BUILD_STATIC=1 BUILD_SHARED=1
}
package() {
- cd libgourou
+ cd libgourou-master
DESTDIR=$pkgdir PREFIX=/ make install install_headers
}
diff --git a/build.patch b/build.patch
index d578b28..b3fab5a 100644
--- a/build.patch
+++ b/build.patch
@@ -7,11 +7,11 @@ index ceaf392..784fd77 100644
endif
-UPDFPARSERLIB = ./lib/updfparser/libupdfparser.a
-+UPDFPARSERLIB = "$(PWD)/../updfparser/libupdfparser.a"
++UPDFPARSERLIB = "$(PWD)/../updfparser-master/libupdfparser.a"
-CXXFLAGS += -Wall -fPIC -I./include -I./usr/include/pugixml -I./lib/updfparser/include
-LDFLAGS = -lpugixml
-+CXXFLAGS += -Wall -fPIC -I./include "-I$(PWD)/../updfparser/include" `pkg-config --cflags pugixml`
++CXXFLAGS += -Wall -fPIC -I./include "-I$(PWD)/../updfparser-master/include" `pkg-config --cflags pugixml`
+LDFLAGS = $(UPDFPARSERLIB) `pkg-config --libs pugixml`
VERSION := $(shell cat include/libgourou.h |grep LIBGOUROU_VERSION|cut -d '"' -f2)
--
2.40.1
Usage instructions at the end of the homepage:
https://indefero.soutade.fr/p/libgourou/
adept_activate -u <AdobeID USERNAME>
# once to login
or
adept_activate --anonymous
to use an anonymous account with no need to login
and then download with:
acsmdownloader -f <ACSM_FILE>
After the encrypted document file is downloaded:
adept_remove filename.epub
and now you have a clear epub (or pdf)
Just created a gourou package that builds from source from the appropriate git tag.
Should be a much cleaner alternative to the -bin package that depends on binary patching executables.
If you want to build against a specific tag then that should be a different package, say gourou and not gourou-bin (compiled by author) and this one, gourou-git (compiled against HEAD).
Am I getting things wrong?
Actually, there is an official upstream version, currently: 0.8.1 according to git describe --tags
.
Can you prepend it to the output of pkgver()
, please, and then add provides=("gourou=${pkgver}")
?
Regards!
Patching within prepare()
fails for me:
==> Starting prepare()...
patching file Makefile
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 39.
Hunk #3 FAILED at 59.
3 out of 3 hunks FAILED -- saving rejects to file Makefile.rej
==> ERROR: A failure occurred in prepare().
Thanks for maintaining!
Please add provides=("gourou")
.
Thanks for maintaining!
Pinned Comments
vcalv commented on 2023-03-25 18:46 (UTC) (edited on 2023-03-28 03:22 (UTC) by vcalv)
Usage instructions at the end of the homepage:
https://indefero.soutade.fr/p/libgourou/
adept_activate -u <AdobeID USERNAME>
# once to loginor
adept_activate --anonymous
to use an anonymous account with no need to loginand then download with:
acsmdownloader -f <ACSM_FILE>
After the encrypted document file is downloaded:
adept_remove filename.epub
and now you have a clear epub (or pdf)