diff options
author | Chris Severance | 2020-06-07 17:51:59 -0400 |
---|---|---|
committer | Chris Severance | 2020-06-07 17:51:59 -0400 |
commit | 45b89aca4c0676c0a30689ac0df4cfec9d3f767f (patch) | |
tree | ea8cba2e5dff94fb513d2135428119ca21cc3f31 | |
parent | a21bdab2911b249acfff718932baa502e187711a (diff) | |
download | aur-45b89aca4c0676c0a30689ac0df4cfec9d3f767f.tar.gz |
autu: Update to 2.0.0.beta.r5.g5553c0be-1
-rw-r--r-- | .SRCINFO | 27 | ||||
-rw-r--r-- | PKGBUILD | 91 | ||||
-rw-r--r-- | notepadqq.install | 32 |
3 files changed, 74 insertions, 76 deletions
@@ -1,28 +1,31 @@ pkgbase = notepadqq-git - pkgdesc = A Linux clone of Notepad++ + pkgdesc = Notepad++-like text editor for Linux pkgver = 2.0.0.beta.r5.g5553c0be pkgrel = 1 - url = http://notepadqq.altervista.org/wp/ - install = notepadqq.install - arch = i686 + url = https://notepadqq.com/ arch = x86_64 + arch = i686 license = GPL3 makedepends = git + makedepends = qt5-tools + makedepends = qt5-websockets makedepends = qt5-tools>=5.6 - depends = qt5-webengine>=5.6 depends = qt5-svg>=5.6 depends = hicolor-icon-theme - depends = desktop-file-utils - provides = notepadqq - conflicts = notepadqq-bin + depends = qt5-svg + depends = qt5-webkit + depends = qt5-webengine>=5.6 + depends = uchardet + provides = notepadqq=2.0.0.beta conflicts = notepadqq - conflicts = notepadqq-common - conflicts = notepadqq-src options = !emptydirs + options = !strip source = git://github.com/notepadqq/notepadqq.git source = git://github.com/notepadqq/CodeMirror.git - sha1sums = SKIP - sha1sums = SKIP + md5sums = SKIP + md5sums = SKIP + sha256sums = SKIP + sha256sums = SKIP pkgname = notepadqq-git @@ -1,52 +1,79 @@ -# Maintainer: Jesse Spangenberger <azulephoenix@gmail.com> +# Maintainer: Chris Severance aur.severach aATt spamgourmet dott com +# Contributor: Jesse Spangenberger <azulephoenix@gmail.com> -pkgname=notepadqq-git -_pkgname=notepadqq +set -u +pkgname=notepadqq +pkgname+='-git' pkgver=2.0.0.beta.r5.g5553c0be pkgrel=1 -pkgdesc="A Linux clone of Notepad++" -arch=('i686' 'x86_64') -url="http://notepadqq.altervista.org/wp/" +pkgdesc='Notepad++-like text editor for Linux' +arch=('x86_64') +arch+=('i686') +#url='http://notepadqq.altervista.org/wp/' +url='https://notepadqq.com/' license=('GPL3') -depends=('qt5-webengine>=5.6' 'qt5-svg>=5.6' 'hicolor-icon-theme' 'desktop-file-utils') -makedepends=('git' 'qt5-tools>=5.6') -provides=('notepadqq') -conflicts=('notepadqq-bin' 'notepadqq' 'notepadqq-common' 'notepadqq-src') -install=${_pkgname}.install -sha1sums=('SKIP' - 'SKIP') +depends=('desktop-file-utils' 'hicolor-icon-theme' 'qt5-svg' 'qt5-webkit') +depends[0]='qt5-svg>=5.6' +depends+=('qt5-webengine>=5.6' 'uchardet') +makedepends=('git' 'qt5-tools') +makedepends+=('qt5-websockets' 'qt5-tools>=5.6') options=('!emptydirs') - -source=("git://github.com/notepadqq/notepadqq.git" - "git://github.com/notepadqq/CodeMirror.git") +options+=('!strip') +provides=("notepadqq=${pkgver%%.r*}") +conflicts=('notepadqq') # 'notepadqq-bin' 'notepadqq-common' 'notepadqq-src' +#install="${pkgname#-git}.install" +_srcdir="${pkgname%-git}" +source=( + 'git://github.com/notepadqq/notepadqq.git' + 'git://github.com/notepadqq/CodeMirror.git' +) +md5sums=('SKIP' + 'SKIP') +sha256sums=('SKIP' + 'SKIP') pkgver() { - cd "${_pkgname}" - set -o pipefail - git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' || - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + set -u + cd "${_srcdir}" + set -o pipefail + if ! git describe --long | sed -e 's/^v//' -e 's/\([^-]*-g\)/r\1/' -e 's/-/./g'; then + printf 'r%s.%s' "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + fi + set +u } prepare() { - cd "${_pkgname}" + set -u + cd "${_srcdir}" - git config submodule.src/editor/libs/codemirror.url "${srcdir}/CodeMirror" - git submodule init - git submodule update + git config submodule.src/editor/libs/codemirror.url "$srcdir/CodeMirror" + git submodule update --init + #git submodule update + set +u } build() { - cd "${_pkgname}" - - qmake-qt5 PREFIX=/usr LRELEASE=/usr/bin/lrelease notepadqq.pro + set -u + cd "${_srcdir}" + + qmake-qt5 PREFIX=/usr LRELEASE=/usr/bin/lrelease notepadqq.pro - make - + if [ -z "${MAKEFLAGS:=}" ] || [ "${MAKEFLAGS//-j/}" = "${MAKEFLAGS}" ]; then + local _nproc="$(nproc)" + if [ "${_nproc}" -gt 8 ]; then + _nproc=8 + fi + _mflags+=('-j' "${_nproc}") + fi + nice make -s -j "${_mflags[@]}" + set +u } package() { - cd "${_pkgname}" + set -u + cd "${_srcdir}" - make INSTALL_ROOT="${pkgdir}" install + make INSTALL_ROOT="$pkgdir" install + set +u } - +set +u diff --git a/notepadqq.install b/notepadqq.install deleted file mode 100644 index bb6fd24234ab..000000000000 --- a/notepadqq.install +++ /dev/null @@ -1,32 +0,0 @@ -# Colored makepkg-like functions -msg_blue() { - printf "${BLUE}==>${ALL_OFF}${BOLD} $1${ALL_OFF}\n" -} - -note() { - printf "${BLUE}==>${ALL_OFF}${YELLOW} NOTE:${ALL_OFF}${BOLD} $1${ALL_OFF}\n" -} - -ALL_OFF="$(tput sgr0)" -BOLD="$(tput bold)" -BLUE="${BOLD}$(tput setaf 4)" -YELLOW="${BOLD}$(tput setaf 3)" - -_update() { - msg_blue "Updating desktop MIME database..." - update-desktop-database -q - msg_blue "Updating icon cache.." - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_install() { - _update -} - -post_upgrade() { - post_install -} - -post_remove() { - _update -} |