From d6a6b3272a2a4da888c13f9540121ef3158bcde3 Mon Sep 17 00:00:00 2001 From: Valter Nazianzeno Date: Wed, 6 Sep 2023 02:24:07 +0000 Subject: [PATCH] textadept: update to 12.1, adopt. --- srcpkgs/textadept/template | 102 +++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 55 deletions(-) diff --git a/srcpkgs/textadept/template b/srcpkgs/textadept/template index e97f96f2a8c69..fe8f79a444a7f 100644 --- a/srcpkgs/textadept/template +++ b/srcpkgs/textadept/template @@ -1,12 +1,18 @@ # Template file for 'textadept' pkgname=textadept -version=11.1 +version=12.1 revision=1 -build_wrksrc="src" -hostmakedepends="tar unzip pkg-config" +build_style=cmake +configure_args=" + -DCMAKE_BUILD_TYPE=None + -DGTK3=ON + -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_DATADIR=/usr/lib + -DCURSES=ON" +hostmakedepends="tar unzip pkg-config cmake" makedepends="gtk+3-devel ncurses-devel" short_desc="Fast, minimalist, and extensible text editor for programmers" -maintainer="Orphaned " +maintainer="Valter Nazianzeno " license="MIT" homepage="https://orbitalquark.github.io/textadept/" # Note: The dependency urls and filenames must be checked and updated manually @@ -14,81 +20,67 @@ homepage="https://orbitalquark.github.io/textadept/" # checksums updated accordingly). This is so that XBPS can cache them. Details: # https://github.com/void-linux/void-packages/pull/15627#issuecomment-549018252 distfiles="https://github.com/orbitalquark/textadept/archive/textadept_${version}.tar.gz - https://www.scintilla.org/scintilla445.tgz - https://github.com/orbitalquark/scinterm/archive/6a774158d8a3c7bc7ea120bc01cdb016fa351a7e.zip - https://github.com/orbitalquark/scintillua/archive/scintillua_4.4.5-2.zip - https://www.lua.org/ftp/lua-5.3.5.tar.gz - http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz + https://www.scintilla.org/scintilla536.tgz + https://www.scintilla.org/lexilla510.tgz + https://github.com/orbitalquark/scinterm/archive/scinterm_5.0.zip + https://github.com/orbitalquark/scintillua/archive/scintillua_6.2.zip + https://www.lua.org/ftp/lua-5.4.6.tar.gz + http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.1.0.tar.gz https://github.com/keplerproject/luafilesystem/archive/v1_8_0.zip - https://github.com/orbitalquark/gtdialog/archive/64587546482a1a6324706d75c80b77d2f87118a4.zip https://invisible-mirror.net/archives/cdk/cdk-5.0-20200923.tgz - http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz" -checksum="55d153fba03aa2e12c2865f38f378154bbc7d2d3e3448a3682b46ee17056fb4c - 4f2168684b4024dc3d6b267320fff1d729192047f4a1b79aeab9ec7c64f733ec - 3b1e3cc3ee48bb158d1d666c7c86d190905c973918914876f6ab3712f8dd7d20 - ccd5b3d615116b8c4376086cf1d03b6ef1f67a565e57446b15eba3f39ef0c180 - 0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac - 48d66576051b6c78388faad09b70493093264588fcd0f258ddaab1cdd4a15ffe + http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.22.tar.gz + https://github.com/orbitalquark/lua-std-regex/archive/1.0.zip" +checksum="7d71d7b9aa43d6d7a751cd01c0bc76e5c57e967265149871edf761767e2b05ce + 89be8278a83e7813925aafe2977daab87d2bd6bebd17b0179fe72afdd548cb24 + 6b3595274005498671b854cf57bdeec2254966f371712fcf3a716d97aa7f3fd8 + 975a9e2cc0ab872a1903f19f997151db4ad8e44b14a0ee5efb5bd926d61d6f6e + be394de8c073d318c1c1677c769c7f92cdfb5af757b76bc4d40ef560cdee0e29 + 7d5ea1b9cb6aa0b59ca3dde1c6adcb57ef83a1ba8e5432c0ecd06bf439b3ad88 + 4b155d67d2246c1ffa7ad7bc466c1ea899bbc40fef0257cc9c03cecbaed4352a e3a6beca7a8a90522eed31db6ccdc5ed65a433826500c6862784e27671b9e18a - 093a4f973196083610c4489e8d9272f340ebf82d48c064f1542c6464eda2af82 007f5de880cb2eebd8556df7e4cd8673d5e64c9970147eee6923a814c29faaed - 6c0d87c94ab9915e76ecd313baec08dedf3bd56de83743d9aa923a081935d2f5" -skip_extraction="scintilla445.tgz - 6a774158d8a3c7bc7ea120bc01cdb016fa351a7e.zip - scintillua_4.4.5-2.zip - lua-5.3.5.tar.gz - lpeg-1.0.2.tar.gz + 6945bd3c4aaa83da83d80a045c5563da4edd7d0374c62c0d35aec09eb3014600 + 5b684a1ce7ea632a37aa4f98bcf265cd97d9d70c5998c56985295c6aa97e74e1" +skip_extraction="scintilla536.tgz + scinterm_5.0.zip + lexilla510.tgz + scintillua_6.2.zip + lua-5.4.6.tar.gz + lpeg-1.1.0.tar.gz v1_8_0.zip - 64587546482a1a6324706d75c80b77d2f87118a4.zip cdk-5.0-20200923.tgz - libtermkey-0.20.tar.gz" + libtermkey-0.22.tar.gz + 1.0.zip" post_extract() { - # We copy the downloaded dep files to src directory so that they are found + # We copy the downloaded dep files to _deps directory so that they are found # and not downloaded again by the build process. This helps to utilize caching. + mkdir -p ${wrksrc}/${build_wrksrc}/build/_deps echo "${skip_extraction}" | while read archive; do if [ -f "${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/${archive}" ]; then cp "${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/${archive}" \ - "${wrksrc}/${build_wrksrc}/" + "${wrksrc}/${build_wrksrc}/build/_deps/" fi done } -pre_configure() { - # For cross builds - vsed -i \ - -e '/^CC =/d' \ - -e '/^CFLAGS =/d' \ - -e '/^CXX =/d' \ - -e 's/^CXXFLAGS =.*/CXXFLAGS += -std=c++17/' Makefile -} - -do_build() { - make deps - # fix build with gcc 12 https://github.com/orbitalquark/textadept/issues/110 - # from https://aur.archlinux.org/cgit/aur.git/commit/PKGBUILD?h=textadept&id=c07c879175c8bea2f43169c71887bd9ebdf8969d - vsed -i '1008s/volatile//;1099s/volatile//;' scintilla/gtk/ScintillaGTKAccessible.cxx - make ${makejobs} GTK3=1 - make ${makejobs} curses -} +post_install() { + # Prepare directories + mkdir -p "${DESTDIR}"/usr/{bin,share/{icons,pixmaps,applications}} -do_install() { - make PREFIX=/usr DESTDIR="${DESTDIR}" install - make curses PREFIX=/usr DESTDIR="${DESTDIR}" install - - # Binaries in /usr/share/textadept are not allowed - # So we relocate to /usr/lib/textadept - mv "${DESTDIR}/usr/share/textadept" "${DESTDIR}/usr/lib/textadept" - ln -sf "/usr/lib/textadept/textadept" "${DESTDIR}/usr/bin/textadept" + ln -sf "/usr/lib/textadept/textadept-gtk" "${DESTDIR}/usr/bin/textadept-gtk" ln -sf "/usr/lib/textadept/textadept-curses" \ "${DESTDIR}/usr/bin/textadept-curses" + # Desktop files + mv "${DESTDIR}/usr/lib/textadept"/*.desktop "${DESTDIR}/usr/share/applications" + # For icons - mkdir -p "${DESTDIR}/usr/share/pixmaps" ln -s "/usr/lib/textadept/core/images/textadept.svg" \ "${DESTDIR}/usr/share/pixmaps/textadept.svg" ln -s "/usr/lib/textadept/core/images/ta_48x48.png" \ "${DESTDIR}/usr/share/pixmaps/textadept.png" + mv "${DESTDIR}/usr/lib/icons" "${DESTDIR}/usr/share/" - vlicense ../LICENSE + vlicense ./LICENSE }