From 32d7d4f313dc03364ee912568ee6b371ccf71165 Mon Sep 17 00:00:00 2001 From: sthen Date: Mon, 1 Mar 2021 13:48:29 +0000 Subject: [PATCH] ugly diff to unbreak pgmodeler, reported by Jose N Figueroa https://marc.info/?t=161296967900002&r=1&w=2 --- databases/pgmodeler/Makefile | 3 ++- databases/pgmodeler/patches/patch-pgmodeler_pri | 11 ++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/databases/pgmodeler/Makefile b/databases/pgmodeler/Makefile index 9cd9a0217f0..c0dd654f021 100644 --- a/databases/pgmodeler/Makefile +++ b/databases/pgmodeler/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.12 2021/01/02 22:31:45 feinerer Exp $ +# $OpenBSD: Makefile,v 1.13 2021/03/01 13:48:29 sthen Exp $ COMMENT = PostgreSQL Database Modeler VERSION = 0.9.3 +REVISION = 0 GH_ACCOUNT = pgmodeler GH_PROJECT = pgmodeler diff --git a/databases/pgmodeler/patches/patch-pgmodeler_pri b/databases/pgmodeler/patches/patch-pgmodeler_pri index 7cdc3875ae8..6cb83188c3a 100644 --- a/databases/pgmodeler/patches/patch-pgmodeler_pri +++ b/databases/pgmodeler/patches/patch-pgmodeler_pri @@ -1,8 +1,17 @@ -$OpenBSD: patch-pgmodeler_pri,v 1.3 2021/01/02 22:31:45 feinerer Exp $ +$OpenBSD: patch-pgmodeler_pri,v 1.4 2021/03/01 13:48:29 sthen Exp $ Index: pgmodeler.pri --- pgmodeler.pri.orig +++ pgmodeler.pri +@@ -81,7 +81,7 @@ linux { + + # Specifies where to find the libraries at runtime + RELATIVE_PRIVATELIBDIR = $$relative_path($$PRIVATELIBDIR, $$BINDIR) +- QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,\'\$$ORIGIN/$$RELATIVE_PRIVATELIBDIR\'" ++ QMAKE_LFLAGS += "-Wl,-rpath,$$PREFIX/lib\ -Wl,-rpath,$$PRIVATELIBDIR" + + # Forcing the display of some warnings + CONFIG(debug, debug|release): QMAKE_CXXFLAGS += "-Wall -Wextra -Wuninitialized" @@ -155,6 +155,7 @@ unix:!macx { PKGCONFIG = libpq libxml-2.0 PGSQL_LIB = -lpq