diff --git a/srcpkgs/freerdp/patches/libressl.patch b/srcpkgs/freerdp/patches/libressl.patch deleted file mode 100644 index 1f2b2dc59bc..00000000000 --- a/srcpkgs/freerdp/patches/libressl.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- winpr/libwinpr/utils/ssl.c.orig 2017-11-28 15:26:30.000000000 +0100 -+++ winpr/libwinpr/utils/ssl.c 2018-01-10 10:28:17.187304871 +0100 -@@ -279,7 +279,7 @@ - - if (flags & WINPR_SSL_INIT_ENABLE_FIPS) - { --#if (OPENSSL_VERSION_NUMBER < 0x10001000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER) - WLog_ERR(TAG, "Openssl fips mode ENable not available on openssl versions less than 1.0.1!"); - #else - WLog_DBG(TAG, "Ensuring openssl fips mode is ENabled"); -@@ -348,7 +348,7 @@ - - BOOL winpr_FIPSMode(void) - { --#if (OPENSSL_VERSION_NUMBER < 0x10001000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER) - return FALSE; - #else - return (FIPS_mode() == 1); diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template index eaa3a118ab7..cba687a8598 100644 --- a/srcpkgs/freerdp/template +++ b/srcpkgs/freerdp/template @@ -1,24 +1,24 @@ # Template file for 'freerdp' pkgname=freerdp -version=2.0.0rc1 -revision=3 +version=2.0.0rc2 +revision=1 wrksrc="FreeRDP-${version/r/-r}" build_style=cmake -configure_args="-DWITH_JPEG=ON -DWITH_PULSE=ON -DWITH_XINERAMA=ON - -DWITH_XEXT=ON -DWITH_XCURSOR=ON -DWITH_XI=ON -DWITH_XRENDER=ON -DWITH_XV=ON - -DWITH_XKBFILE=ON -DWITH_FFMPEG=ON -DWITH_GSTREAMER_0_10=OFF -DWITH_GSTREAMER_1_0=OFF -DWITH_ALSA=ON - -DWITH_CUPS=OFF -DWITH_PCSC=OFF -DWITH_LIBSYSTEMD=OFF -DWITH_WAYLAND=OFF" +configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON + -DWITH_GSTREAMER_0_10=OFF -DWITH_GSTREAMER_1_0=OFF -DWITH_JPEG=ON + -DWITH_LIBSYSTEMD=OFF -DWITH_PCSC=OFF -DWITH_PULSE=ON -DWITH_WAYLAND=OFF + -DWITH_XCURSOR=ON -DWITH_XEXT=ON -DWITH_XI=ON -DWITH_XINERAMA=ON + -DWITH_XKBFILE=ON -DWITH_XRENDER=ON -DWITH_XV=ON" hostmakedepends="pkg-config xmlto" -makedepends=" - alsa-lib-devel libjpeg-turbo-devel pulseaudio-devel libXinerama-devel - libXext-devel libXcursor-devel libXi-devel libXrandr-devel libXv-devel - libxkbfile-devel ffmpeg-devel glib-devel libressl-devel zlib-devel" +makedepends="alsa-lib-devel ffmpeg-devel glib-devel + libXcursor-devel libXinerama-devel libXrandr-devel libXv-devel + libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel" short_desc="Free RDP (Remote Desktop Protocol) client" maintainer="Juan RP " license="Apache-2.0" homepage="http://www.freerdp.com/" distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version/r/-r}.tar.gz" -checksum=a2c1c83072489d56da78bbe76c29729022f5c35a3ec3a1ce26cea8823de043c2 +checksum=a09e338b996fada44bf1277f423240d0fa82289799e2e5dea9d9c63201554de1 case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";; diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template index ab94530eb79..b80ad1b38a5 100644 --- a/srcpkgs/remmina/template +++ b/srcpkgs/remmina/template @@ -1,9 +1,8 @@ # Template file for 'remmina' pkgname=remmina -version=1.2.0rc29 -revision=2 -_gitrev=1.2.0-rcgit.29 -wrksrc="Remmina-${_gitrev}" +version=1.2.30 +revision=1 +wrksrc="Remmina-${version}" build_style=cmake configure_args="-DWITH_APPINDICATOR=OFF" hostmakedepends="intltool pkg-config" @@ -14,10 +13,10 @@ makedepends="avahi-glib-libs-devel avahi-ui-libs-devel depends="desktop-file-utils hicolor-icon-theme" short_desc="Remote desktop client written in GTK+" maintainer="cr6git " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://www.remmina.org/wp/" -distfiles="https://github.com/FreeRDP/Remmina/archive/v${_gitrev}.tar.gz" -checksum=24fdcc8b69f8563c464b6ac77dd6bf93a1c963d90f8a114e1a3abad9af2b8682 +distfiles="https://github.com/FreeRDP/Remmina/archive/v${version}.tar.gz" +checksum=2f102e20e134d2ccc7dac709fd6e1fcc9cd174092ec351fca8c661dabc21ca44 case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" libexecinfo-devel" ;;