diff --git a/srcpkgs/barrier/patches/avahi.patch b/srcpkgs/barrier/patches/avahi.patch deleted file mode 100644 index fe5704552f7..00000000000 --- a/srcpkgs/barrier/patches/avahi.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- masterdir/builddir/barrier-2.1.1/CMakeLists.txt 2018-05-16 04:48:18.000000000 +0200 -+++ CMakeLists.txt 2018-05-25 18:57:40.584542261 +0200 -@@ -63,6 +63,7 @@ - include (CheckIncludeFileCXX) - include (CheckSymbolExists) - include (CheckCSourceCompiles) -+ include (FindPkgConfig) - - check_include_file_cxx (istream HAVE_ISTREAM) - check_include_file_cxx (ostream HAVE_OSTREAM) -@@ -162,6 +163,11 @@ - include_directories("/usr/local/include" "/usr/local/include/avahi-compat-libdns_sd") - link_directories("/usr/local/lib") - endif() -+ if (${PKG_CONFIG_FOUND}) -+ pkg_check_modules (LIBDNS_SD REQUIRED avahi-compat-libdns_sd) -+ include_directories (BEFORE SYSTEM ${LIBDNS_SD_INCLUDE_DIRS}) -+ set (CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${LIBDNS_SD_INCLUDE_DIRS}") -+ endif () - - set (XKBlib "X11/Xlib.h;X11/XKBlib.h") - set (CMAKE_EXTRA_INCLUDE_FILES "${XKBlib};X11/extensions/Xrandr.h") diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template index d165a70516b..6bbd9691807 100644 --- a/srcpkgs/barrier/template +++ b/srcpkgs/barrier/template @@ -1,6 +1,6 @@ # Template file for 'barrier' pkgname=barrier -version=2.1.1 +version=2.1.2 revision=1 build_style=cmake configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE" @@ -12,11 +12,7 @@ maintainer="John " license="GPL-2.0-only" homepage="https://github.com/debauchee/barrier" distfiles="https://github.com/debauchee/barrier/archive/v${version}.tar.gz" -checksum=775d504db6091c4dc479657fc4fc566ceb9893426664ae60c9a2bb198b562774 - -pre_build() { - sed -i -e 's/__DATE__/"May 25 2018"/g' src/gui/src/AboutDialog.cpp -} +checksum=2a6c930157adf500ff664b628fad926256b7fff9555b40c1e50bf8114efcfb3f do_install() { vbin build/bin/barrier @@ -34,6 +30,7 @@ do_install() { vsv barriers } + barrier-gui_package() { pkg_install() { vmove usr/share/pixmaps