makedeb


rofi-git 19f0a8c92022.04.16-2


A window switcher, run dialog and dmenu replacement

Click here to go back to the commit logs for rofi-git.

Commit:


Hash: 9e762bff9b44543eb62aee54f505da1fa3c28492

Message: minor fix

Diff


diff --git a/.SRCINFO b/.SRCINFO
index 78b27d0..11b430b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,58 +1,68 @@
-generated-by = makedeb-makepkg
-
-pkgbase = rofi-git
-	pkgdesc = A window switcher, run dialog and dmenu replacement
-	pkgver = 1.7.0.r2.gf6cd6c3a
-	pkgrel = 1
-	url = https://github.com/DaveDavenport/rofi/
-	arch = x86_64
-	license = MIT
-	checkdepends = check
-	makedepends = git
-	makedepends = meson
-	makedepends = flex
-	makedepends = bison
-	makedepends = ninja-build
-	makedepends = ronn
-	makedepends = doxygen
-	makedepends = uncrustify
-	makedepends = cppcheck
-	makedepends = ohcount
-	makedepends = autoconf
-	depends = freetype2-demos
-	depends = libjpeg-dev
-	depends = librsvg2-dev
-	depends = libx11-dev
-	depends = libxcb1-dev
-	depends = libxdg-basedir-dev
-	depends = libxft-dev
-	depends = libxkbcommon-dev
-	depends = libxkbcommon-x11-dev
-	depends = libpango1.0-dev
-	depends = libstartup-notification0-dev
-	depends = libglib2.0-dev
-	depends = libcairo2-dev
-	depends = libpango1.0-dev
-	depends = libxkbcommon-dev
-	depends = libgdk-pixbuf2.0-dev
-	depends = libxcb-util0-dev
-	depends = libxcb-xkb-dev
-	depends = libxkbcommon-x11-dev
-	depends = libxcb-ewmh-dev
-	depends = libxcb-icccm4-dev
-	depends = libxcb-cursor-dev
-	depends = libstartup-notification0-dev
-	depends = libxcb-xrm-dev
-	depends = libxcb-randr0-dev
-	depends = libxcb-randr0-dev
-	depends = libxcb-xinerama0-dev
-	provides = rofi
-	conflicts = rofi
-	source = git+https://github.com/DaveDavenport/rofi#branch=next
-	source = git+https://github.com/sardemff7/libgwater
-	source = git+https://github.com/sardemff7/libnkutils
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-
+generated-by = makedeb
 pkgname = rofi-git
+pkgbase = rofi-git
+pkgdesc = A window switcher, run dialog and dmenu replacement
+pkgrel = 2
+pkgver = 19f0a8c92022.04.16
+url = https://github.com/DaveDavenport/rofi/
+arch = amd64
+checkdepends = check
+conflicts = rofi
+depends = freetype2-demos
+depends = libjpeg-dev
+depends = librsvg2-dev
+depends = libx11-dev
+depends = libxcb1-dev
+depends = libxdg-basedir-dev
+depends = libxft-dev
+depends = libxkbcommon-dev
+depends = libxkbcommon-x11-dev
+depends = libpango1.0-dev
+depends = libstartup-notification0-dev
+depends = libglib2.0-dev
+depends = libcairo2-dev
+depends = libpango1.0-dev
+depends = libxkbcommon-dev
+depends = libgdk-pixbuf2.0-dev
+depends = libxcb-util0-dev
+depends = libxcb-xkb-dev
+depends = libxkbcommon-x11-dev
+depends = libxcb-ewmh-dev
+depends = libxcb-icccm4-dev
+depends = libxcb-cursor-dev
+depends = libstartup-notification0-dev
+depends = libxcb-xrm-dev
+depends = libxcb-randr0-dev
+depends = libxcb-randr0-dev
+depends = libxcb-xinerama0-dev
+license = MIT
+makedepends = git
+makedepends = meson
+makedepends = flex
+makedepends = bison
+makedepends = ninja-build
+makedepends = ronn
+makedepends = doxygen
+makedepends = uncrustify
+makedepends = cppcheck
+makedepends = ohcount
+makedepends = autoconf
+provides = rofi
+source = rofi::git+https://github.com/DaveDavenport/rofi#branch=next
+source = libgwater::git+https://github.com/sardemff7/libgwater
+source = libnkutils::git+https://github.com/sardemff7/libnkutils
+sha256sums = SKIP
+sha256sums = SKIP
+sha256sums = SKIP
+checkdepends = check
+makedepends = git
+makedepends = meson
+makedepends = flex
+makedepends = bison
+makedepends = ninja-build
+makedepends = ronn
+makedepends = doxygen
+makedepends = uncrustify
+makedepends = cppcheck
+makedepends = ohcount
+makedepends = autoconf
diff --git a/PKGBUILD b/PKGBUILD
index a3f373b..15a1455 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,12 @@
 # Maintainer: only_vip <onlyme_vip@protonmail.com>
 pkgname=rofi-git
 _pkgname=rofi
-pkgver=1.7.0.r2.gf6cd6c3a
-pkgrel=1
+_libgwater=libgwater
+_libnkutils=libnkutils
+pkgver=19f0a8c92022.04.16
+pkgrel=2
 pkgdesc='A window switcher, run dialog and dmenu replacement'
-arch=('x86_64')
+arch=('amd64')
 url='https://github.com/DaveDavenport/rofi/'
 license=('MIT')
 depends=( 'freetype2-demos' 'libjpeg-dev' 'librsvg2-dev' 'libx11-dev' 'libxcb1-dev' 'libxdg-basedir-dev' 'libxft-dev' 'libxkbcommon-dev' 'libxkbcommon-x11-dev' 'libpango1.0-dev' 'libstartup-notification0-dev' 'libglib2.0-dev' 'libcairo2-dev' 'libpango1.0-dev' 'libxkbcommon-dev' 'libgdk-pixbuf2.0-dev' 'libxcb-util0-dev' 'libxcb-xkb-dev' 'libxkbcommon-x11-dev' 'libxcb-ewmh-dev' 'libxcb-icccm4-dev' 'libxcb-cursor-dev' 'libstartup-notification0-dev' 'libxcb-xrm-dev' 'libxcb-randr0-dev' 'libxcb-randr0-dev' 'libxcb-xinerama0-dev')
@@ -14,17 +16,20 @@ provides=("${_pkgname}")
 conflicts=("${_pkgname}")
 # replaces=("${_pkgname}")
 source=(
-  'git+https://github.com/DaveDavenport/rofi#branch=next'
-  'git+https://github.com/sardemff7/libgwater'
-  'git+https://github.com/sardemff7/libnkutils'
+  "${_pkgname}::git+https://github.com/DaveDavenport/rofi#branch=next"
+  "${_libgwater}::git+https://github.com/sardemff7/libgwater"
+  "${_libnkutils}::git+https://github.com/sardemff7/libnkutils"
 )
 sha256sums=('SKIP' 'SKIP' 'SKIP')
 
 pkgver() {
   cd "${pkgname/-git}"
-
-  git describe --long --tags \
-    | sed 's/-/.r/;s/-/./'
+  #git describe --long --tags \
+    #| sed 's/-/.r/;s/-/./'
+    _always=$(git describe --always | sed -e 's:-:.:g' -e 's:vNext::') # always is mobile, and switches between numbers and letters, can't use it for versioning
+    _commits=$(git rev-list --count HEAD | sed 's:-:.:g') # total commits is the most sane way of getting incremental pkgver
+    _date=$(git log -1 --date=short --pretty=format:%cd)
+    printf "%s%s%s\n" "${_commits}" "${_always}" "${_date}" | sed -e 's:-:.:g'  -e 's:_:.:g'
 }
 
 prepare() {