summaryrefslogtreecommitdiff
path: root/dev-db/pgadmin3/files
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2019-01-23 14:48:32 -0500
committerBrian Evans <grknight@gentoo.org>2019-01-23 14:48:32 -0500
commit6d1da50b8257d38b280f9719ab9dbc2069884ce5 (patch)
tree56a370ac3e8e5b0894856b3bd283ccd8cfa91df2 /dev-db/pgadmin3/files
parent82295e83233e4cb68efae24b8fe6e88b409abe24 (diff)
downloadgentoo-6d1da50b8257d38b280f9719ab9dbc2069884ce5.tar.gz
gentoo-6d1da50b8257d38b280f9719ab9dbc2069884ce5.tar.bz2
gentoo-6d1da50b8257d38b280f9719ab9dbc2069884ce5.zip
Revert "dev-db/pgadmin3: Remove last rites package"
This reverts commit c27c8dfa1bc0dd1371ce9cd0a1383a44965b0dc9. Signed-off-by: Brian Evans <grknight@gentoo.org>
Diffstat (limited to 'dev-db/pgadmin3/files')
-rw-r--r--dev-db/pgadmin3/files/pgadmin3-desktop-r1.patch15
-rw-r--r--dev-db/pgadmin3/files/pgadmin3-gcc6-null-pointer.patch11
2 files changed, 26 insertions, 0 deletions
diff --git a/dev-db/pgadmin3/files/pgadmin3-desktop-r1.patch b/dev-db/pgadmin3/files/pgadmin3-desktop-r1.patch
new file mode 100644
index 000000000000..64a599e00cdb
--- /dev/null
+++ b/dev-db/pgadmin3/files/pgadmin3-desktop-r1.patch
@@ -0,0 +1,15 @@
+diff -Naruw a/pkg/pgadmin3.desktop b/pkg/pgadmin3.desktop
+--- a/pkg/pgadmin3.desktop 2013-02-22 12:21:19.000000000 -0500
++++ b/pkg/pgadmin3.desktop 2015-02-04 15:36:34.845312953 -0500
+@@ -2,9 +2,8 @@
+ Encoding=UTF-8
+ Name=pgAdmin III
+ Exec=/usr/bin/pgadmin3
+-Icon=/usr/share/pgadmin3/pgAdmin3.png
++Icon=/usr/share/pixmaps/pgadmin3.png
+ Type=Application
+-Categories=Application;Development;
+-MimeType=text/html
++Categories=Development;
+ DocPath=/usr/share/pgadmin3/docs/en_US/index.html
+ Comment=PostgreSQL Tools
diff --git a/dev-db/pgadmin3/files/pgadmin3-gcc6-null-pointer.patch b/dev-db/pgadmin3/files/pgadmin3-gcc6-null-pointer.patch
new file mode 100644
index 000000000000..1396f8de8aab
--- /dev/null
+++ b/dev-db/pgadmin3/files/pgadmin3-gcc6-null-pointer.patch
@@ -0,0 +1,11 @@
+--- 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.