diff --git a/goldendict-webengine-pr-git/.CI/config b/goldendict-webengine-pr-git/.CI/config deleted file mode 100644 index a146b2b7d..000000000 --- a/goldendict-webengine-pr-git/.CI/config +++ /dev/null @@ -1,2 +0,0 @@ -CI_PACKAGE_BUMP=22.12.02.r84.5a87a715.97d879ed-1/2 -CI_PKGBUILD_SOURCE=aur diff --git a/goldendict-webengine-pr-git/.CI/info b/goldendict-webengine-pr-git/.CI/info deleted file mode 100644 index 4d65dd9fc..000000000 --- a/goldendict-webengine-pr-git/.CI/info +++ /dev/null @@ -1,2 +0,0 @@ -REQ_ORIGIN=github/1686 -REQ_REASON=request diff --git a/goldendict-webengine-pr-git/.SRCINFO b/goldendict-webengine-pr-git/.SRCINFO deleted file mode 100644 index 32942023f..000000000 --- a/goldendict-webengine-pr-git/.SRCINFO +++ /dev/null @@ -1,37 +0,0 @@ -pkgbase = goldendict-webengine-pr-git - pkgdesc = Feature-rich dictionary lookup program supporting multiple dictionary formats - pkgver = 22.12.02.r79.5a87a715.59363bc9 - pkgrel = 1 - url = https://github.com/goldendict/goldendict/pull/1542 - arch = i686 - arch = x86_64 - license = GPL3 - makedepends = git - depends = bzip2 - depends = ffmpeg - depends = gcc-libs - depends = glibc - depends = hunspell - depends = libao - depends = libeb - depends = libtiff - depends = libvorbis - depends = libx11 - depends = libxtst - depends = lzo - depends = opencc - depends = qt5-base - depends = qt5-multimedia - depends = qt5-svg - depends = qt5-tools - depends = qt5-webengine - depends = qt5-x11extras - depends = xz - depends = zlib - depends = zstd - provides = goldendict=22.12.02.r79.5a87a715.59363bc9 - conflicts = goldendict - source = goldendict-webengine-pr-git::git+https://github.com/vedgy/goldendict.git#branch=we/webkit-or-webengine - b2sums = SKIP - -pkgname = goldendict-webengine-pr-git diff --git a/goldendict-webengine-pr-git/PKGBUILD b/goldendict-webengine-pr-git/PKGBUILD deleted file mode 100644 index 8b1730221..000000000 --- a/goldendict-webengine-pr-git/PKGBUILD +++ /dev/null @@ -1,149 +0,0 @@ -# Maintainer: Igor Kushnir < igorkuo AT gmail dot com > -# Contributor: Marcell Meszaros < marcell.meszaros AT runbox.eu > -# Contributor: aksr -# Contributor: VirtualTam -# Contributor: Eugene Yudin aka Infy - -pkgname='goldendict-webengine-pr-git' -_basename='goldendict' -pkgver=22.12.02.r79.5a87a715.59363bc9 -pkgrel=1 -pkgdesc='Feature-rich dictionary lookup program supporting multiple dictionary formats' -arch=('i686' 'x86_64') -_upstream_url="https://github.com/${_basename}/${_basename}" -_fork_url="https://github.com/vedgy/${_basename}" -url="${_upstream_url}/pull/1542" -license=('GPL3') -depends=( - 'bzip2' - 'ffmpeg' - 'gcc-libs' - 'glibc' - 'hunspell' - 'libao' - 'libeb' - 'libtiff' - 'libvorbis' - 'libx11' - 'libxtst' - 'lzo' - 'opencc' - 'qt5-base' - 'qt5-multimedia' - 'qt5-svg' - 'qt5-tools' - 'qt5-webengine' - 'qt5-x11extras' - 'xz' - 'zlib' - 'zstd' -) -makedepends=('git') -provides=("${_basename}=${pkgver}") -conflicts=("${_basename}") -# Note: the we/webkit-or-webengine branch contains the same code as the pull request's branch -# webkit-or-webengine, but is stable. That is, upstream master is merged in not rebased onto. -source=("${pkgname}::git+${_fork_url}.git#branch=we/webkit-or-webengine") -b2sums=('SKIP') - -_merge_committer_name='GD WE PR merger' - -pkgver() { - cd "${pkgname}" - - # Generate git tag based version. Count only expected we##.##.##* [#=digit] tags. - local _gitversion=$(git describe --long --tags --match 'we[0-9][0-9].[0-9][0-9].[0-9][0-9]*' \ - | sed -e 's|^we||' | tr '[:upper:]' '[:lower:]') - - # Format git-based version for pkgver - # Expected format: e.g. 22.12.02.r0.ga64d1bb4 - _gitversion="$( - echo "${_gitversion}" | sed \ - -e 's|^\([0-9][0-9.]*\)-\([a-zA-Z]\+\)|\1\2|' \ - -e 's|\([0-9]\+-g\)|r\1|' \ - -e 's|-|.|g' - )" - - # Ensure stable version based on SHA1 IDs of public source commits, not transient merge commits. - - # Remove the SHA1 ID of a transient merge commit - # Expected format: e.g. 22.12.02.r0 - _gitversion="${_gitversion%\.g[a-f0-9]*}" - - # Gather SHA1 IDs of all parent commits of the merge commits created in prepare(). - local _base_commits="$(git log --author="$_merge_committer_name" --format='%p' --reverse)" - if [ -z "$_base_commits" ]; then - # If no merge commits were created in prepare(), use the HEAD commit's SHA1 ID. - _base_commits="$(git rev-parse --short HEAD)" - fi - - local _commit - for _commit in $_base_commits; do - if [ "$(git show $_commit --format='%an')" == "$_merge_committer_name" ]; then - continue # skip this transient merge commit - fi - _gitversion+=".$_commit" - done - - # Print final version with SHA1 IDs of public source commits at the end. - # Expected format: e.g. 22.12.02.r0.7b4a8328.7da1ccf2 - # The order of SHA1 IDs: 1) we/webkit-or-webengine; 2) master; 3) other merged branches (optional). - echo "$_gitversion" -} - -_git_pull() { - # Ensure that merging does not require user interaction and succeeds even if git - # user.name, user.email and pull.rebase are not configured in the user's system. - git -c "user.name=$_merge_committer_name" -c "user.email=gd-we-pr-merger@example.com" pull --no-rebase --no-edit "$@" -} - -# Branches of some pull requests conflict with the we/webkit-or-webengine branch. -# The conflicts are resolved in merge commits to branches with the "we/" prefix -# in their names. This _pull_we function checks if the corresponding -# "we/"-prefixed branch exists and prefers that to the main pull request branch. -# Takes a single argument: a branch name in "${_fork_url}". -_pull_we() { - local _branch_name="$1" - local _we_branch_name="we/${_branch_name}" - git ls-remote --exit-code --heads origin "${_we_branch_name}" && true - if [ $? -eq 0 ]; then - _branch_name="${_we_branch_name}" - fi - _git_pull origin "${_branch_name}" -} - -prepare() { - cd "${pkgname}" - - # If merging upstream master fails, please do the following: - # 1) comment this line out to finish the build; - # 2) flag the package out-of-date. - _git_pull "${_upstream_url}" master - - # If you wish to include a fix or a feature from one of vedgy's pull requests - # (https://github.com/goldendict/goldendict/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc+author%3Avedgy), - # uncomment and possibly modify one or more of the following lines: - # _pull_we add-zoom-cmd-line-options - # _pull_we wip-pronounce-stop-if-playing-and-from-next-dictionary - # _pull_we all-my-fixes - - echo "Fixing QMake in goldendict.pro file..." - echo "QMAKE_CXXFLAGS_RELEASE = ${CFLAGS}" >> goldendict.pro - echo "QMAKE_CFLAGS_RELEASE = ${CXXFLAGS}" >> goldendict.pro -} - -build() { - cd "${pkgname}" - qmake-qt5 \ - 'CONFIG+=use_qtwebengine' \ - 'CONFIG+=chinese_conversion_support' \ - 'CONFIG+=zim_support' \ - PREFIX='/usr' \ - goldendict.pro - make -} - -package() { - cd "${pkgname}" - make INSTALL_ROOT="${pkgdir}" install -} diff --git a/libeb/.CI/config b/libeb/.CI/config deleted file mode 100644 index 66bee9477..000000000 --- a/libeb/.CI/config +++ /dev/null @@ -1 +0,0 @@ -CI_PKGBUILD_SOURCE=aur diff --git a/libeb/.CI/info b/libeb/.CI/info deleted file mode 100644 index 105e05dc7..000000000 --- a/libeb/.CI/info +++ /dev/null @@ -1,2 +0,0 @@ -REQ_ORIGIN=github/1686 -REQ_REASON=depends diff --git a/libeb/.SRCINFO b/libeb/.SRCINFO deleted file mode 100644 index 14258bbc1..000000000 --- a/libeb/.SRCINFO +++ /dev/null @@ -1,20 +0,0 @@ -pkgbase = libeb - pkgdesc = C library for accessing CD-ROM books. Supports EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING formats. - pkgver = 4.4.3 - pkgrel = 11 - url = http://www.mistys-internet.website/eb/index-en.html - arch = i686 - arch = x86_64 - license = BSD - depends = perl - depends = zlib - provides = libeb.so - provides = eb-library - conflicts = eb-library - replaces = eb-library - source = libeb-4.4.3.tar.bz2::https://github.com/mistydemeo/eb/releases/download/v4.4.3/eb-4.4.3.tar.bz2 - source = libeb-4.4.3-14-010_debian.patch::https://sources.debian.org/data/main/e/eb/4.4.3-14/debian/patches/010_debian.patch - sha256sums = abe710a77c6fc3588232977bb2f30a2e69ddfbe9fa8d0b05b0d67d95e36f4b5f - sha256sums = dc98114f7bc7e7fc0da2fac5c741f91fb2a3079b0e096fbdf955755fc61c0f19 - -pkgname = libeb diff --git a/libeb/PKGBUILD b/libeb/PKGBUILD deleted file mode 100644 index 579ca3745..000000000 --- a/libeb/PKGBUILD +++ /dev/null @@ -1,70 +0,0 @@ -# Maintainer: Marcell Meszaros < marcell.meszaros AT runbox.eu > -# Contributor: aksr - -pkgname='libeb' -_pkgname='eb' -pkgver=4.4.3 -pkgrel=11 -_pkgrel_debian=14 # Version of Debian package patch -pkgdesc='C library for accessing CD-ROM books. Supports EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING formats.' -arch=('i686' 'x86_64') -url='http://www.mistys-internet.website/eb/index-en.html' -license=('BSD') -depends=('perl' 'zlib') -provides=('libeb.so' 'eb-library') -conflicts=('eb-library') -replaces=('eb-library') # Has been deleted from AUR and merged into this package -_patch1_name="${pkgname}-${pkgver}-${_pkgrel_debian}-010_debian.patch" -source=("${pkgname}-${pkgver}.tar.bz2::https://github.com/mistydemeo/${_pkgname}/releases/download/v${pkgver}/${_pkgname}-${pkgver}.tar.bz2" - "${_patch1_name}::https://sources.debian.org/data/main/${_pkgname:0:1}/${_pkgname}/${pkgver}-${_pkgrel_debian}/debian/patches/010_debian.patch") -sha256sums=('abe710a77c6fc3588232977bb2f30a2e69ddfbe9fa8d0b05b0d67d95e36f4b5f' - 'dc98114f7bc7e7fc0da2fac5c741f91fb2a3079b0e096fbdf955755fc61c0f19') - -prepare() { - cd "${_pkgname}-${pkgver}" - - msg2 "[patch] Applying ${_patch1_name}..." - patch --forward --strip=1 --input="../${_patch1_name}" - - msg2 "Removing link configuration for unused libraries" - sed -e 's/-liconv//g' \ - -i 'm4/gettext.m4' \ - -i 'configure' - sed -e 's/-lnsl//g' \ - -e 's/-lresolv//g' \ - -i 'configure' - sed -e '/AC_CHECK_LIB(nsl/c/' \ - -e '/AC_CHECK_LIB(resolv/c/' \ - -i 'configure.ac' - - msg2 "[autoupdate] Refreshing configure.ac..." - autoupdate --force - - msg2 '[autoreconf] Refreshing make configuration scripts...' - autoreconf --verbose --force --install --symlink -} - -build() { - cd "${_pkgname}-${pkgver}" - CFLAGS+=' -Wno-incompatible-pointer-types' - ./configure \ - --prefix='/usr' \ - --libexecdir="/usr/lib/${pkgname}" \ - --localstatedir="/var/lib/${pkgname}" \ - --sysconfdir='/etc' \ - --with-pkgdocdir="/usr/share/doc/html/${pkgname}" \ - --disable-silent-rules \ - --disable-static - make -} - -check() { - cd "${_pkgname}-${pkgver}" - make -k check -} - -package() { - cd "${_pkgname}-${pkgver}" - make DESTDIR="$pkgdir" install - install -D -m644 'COPYING' "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -}