From 7cb0377f1471ef7d3f94918bd268250936fc1893 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 11 Aug 2022 00:39:09 +0200 Subject: [PATCH] pgadmin3: remove package doesn't build with recent postgresql --- .../patches/pgadmin3-fix-segfault.patch | 13 ---- .../patches/pgadmin3_unbundle-libssh.patch | 68 ------------------- srcpkgs/pgadmin3/template | 27 -------- srcpkgs/removed-packages/template | 1 + 4 files changed, 1 insertion(+), 108 deletions(-) delete mode 100644 srcpkgs/pgadmin3/patches/pgadmin3-fix-segfault.patch delete mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch delete mode 100644 srcpkgs/pgadmin3/template diff --git a/srcpkgs/pgadmin3/patches/pgadmin3-fix-segfault.patch b/srcpkgs/pgadmin3/patches/pgadmin3-fix-segfault.patch deleted file mode 100644 index a42d1992b658..000000000000 --- a/srcpkgs/pgadmin3/patches/pgadmin3-fix-segfault.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://bugs.archlinux.org/task/52683 - ---- a/pgadmin/frm/plugins.cpp -+++ b/pgadmin/frm/plugins.cpp -@@ -380,7 +380,7 @@ bool pluginUtilityFactory::CheckEnable(p - { - // If we need a specific server type, we can't enable unless - // we have a connection. -- if (!obj || !(obj->GetConnection()->GetStatus() == PGCONN_OK)) -+ if (!obj || !obj->GetConnection() || !(obj->GetConnection()->GetStatus() == PGCONN_OK)) - return false; - - // Get the server type. diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch deleted file mode 100644 index 3a678ef3bed9..000000000000 --- a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -rupN configure.ac.in configure.ac.in ---- a/configure.ac.in 2020-03-24 05:15:11.000000000 +0100 -+++ b/configure.ac.in 2020-04-09 14:54:07.189090418 +0200 -@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio. - AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h]) - AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no]) - AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes) --AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h]) - - # Checks for typedefs, structures, and compiler characteristics. - AC_HEADER_STDBOOL -diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk ---- a/pgadmin/include/module.mk 2020-03-24 05:15:11.000000000 +0100 -+++ b/pgadmin/include/module.mk 2020-04-09 14:54:07.190090419 +0200 -@@ -36,5 +36,4 @@ include include/gqb/module.mk - include include/hotdraw/module.mk - include include/utils/module.mk - include include/ogl/module.mk --include include/libssh2/module.mk - -diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am ---- a/pgadmin/Makefile.am 2020-03-24 05:15:11.000000000 +0100 -+++ b/pgadmin/Makefile.am 2020-04-09 14:54:09.880094260 +0200 -@@ -49,7 +49,6 @@ include gqb/module.mk - include hotdraw/module.mk - include ui/module.mk - include utils/module.mk --include libssh2/module.mk - - if SUN_CC - __CFLAGS="" -@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \ - $(TMP_ui) - endif - --if BUILD_SSH_TUNNEL --AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ) --else - AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ) -+if BUILD_SSH_TUNNEL -+AM_LDFLAGS = -lssh2 - endif - - # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy -@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \ - $(TMP_ui) - endif - --if BUILD_SSH_TUNNEL --AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ) --else - AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ) --endif - - install-exec-hook: - cd $(bindir) ;\ -diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp ---- a/pgadmin/utils/sshTunnel.cpp 2020-03-24 05:15:11.000000000 +0100 -+++ b/pgadmin/utils/sshTunnel.cpp 2020-04-09 14:54:07.191090420 +0200 -@@ -15,7 +15,7 @@ - - #undef ssize_t - #define ssize_t long --#include "libssh2/libssh2.h" -+#include - #include "utils/sshTunnel.h" - #include "frm/frmMain.h" - diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template deleted file mode 100644 index ad2465b3413c..000000000000 --- a/srcpkgs/pgadmin3/template +++ /dev/null @@ -1,27 +0,0 @@ -# Template file for 'pgadmin3' -pkgname=pgadmin3 -version=1.22.2 -revision=14 -build_style=gnu-configure -configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0" -hostmakedepends="automake libtool" -makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel" -short_desc="Comprehensive design and management interface for PostgreSQL" -maintainer="Gerardo Di Iorio " -license="0BSD" -homepage="http://www.pgadmin.org" -distfiles="https://ftp.postgresql.org/pub/pgadmin/pgadmin3/v${version}/src/pgadmin3-${version}.tar.gz" -checksum=9b68b0e3d3f0a261344fb8196825967d1e7acaca1d8cc82c42e12368ca5844ac -nocross=yes - -CXXFLAGS="-Wno-narrowing" - -pre_configure() { - autoreconf -fi - sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc - sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure -} -post_install() { - vlicense LICENSE -} - diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 30cb55c291fb..0d1180ad4903 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -274,6 +274,7 @@ replaces=" perl-Gtk2-Ex-Simple-List<=0.50_4 perl-Gtk2-ImageView<=0.05_8 perl-Gtk2-Notify<=0.05_8 + pgadmin3<=1.22.2_14 phonon-backend-gstreamer<=4.9.0_2 phonon-backend-vlc<=0.9.1_3 polkit-qt<=0.112.0_5