summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Noisel2022-10-13 20:22:27 +0200
committerChristophe Noisel2022-10-13 21:06:58 +0200
commit1b0652f1bc4968333d215dc01bbdf4db26054a99 (patch)
treebe7f360cbc219c057153248b26f7fb0ae1544731
parentf510ae4ba793eb9c338841f1123658cdd191da2b (diff)
downloadaur-1b0652f1bc4968333d215dc01bbdf4db26054a99.tar.gz
jumped to version 0.14.90 (master)
-rw-r--r--.SRCINFO38
-rw-r--r--05ba23be296085313abd8d7d5075d962084f5d38.patch26
-rw-r--r--0cc65e2f420af45f78d190ac2af64810a148bb31.patch41
-rw-r--r--42e0d6b3f60b06bbe55b3ebad7ffc6edbf16e7e0.patch29
-rw-r--r--8dd069a1e54c5b47e107f6df0db6ceb03e50c72d.patch296
-rw-r--r--PKGBUILD80
-rw-r--r--cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch147
-rw-r--r--f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch114
-rw-r--r--fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch41
9 files changed, 43 insertions, 769 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2740e1359b1e..e20c4416d220 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,36 +1,18 @@
-# Generated by mksrcinfo v8
-# Wed Mar 27 09:16:00 UTC 2019
pkgbase = planner
pkgdesc = Project management application for GNOME
- pkgver = 0.14.6
- pkgrel = 6
+ pkgver = 0.14.90
+ pkgrel = 7
url = https://wiki.gnome.org/Apps/Planner
arch = x86_64
license = GPL
- makedepends = intltool
- makedepends = gtk-doc
- makedepends = pygtk
- makedepends = rarian
- depends = libgnomecanvas
- depends = libxslt
- depends = gconf
+ makedepends = meson
+ depends = glib2>=2.50,
+ depends = gtk3>=3.10,
+ depends = libxml2>=2.6.27,
+ depends = libxslt>=1.1.2,
+ depends = libgda>=5.0
options = !emptydirs
- source = https://download.gnome.org/sources/planner/0.14/planner-0.14.6.tar.xz
- source = f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch
- source = 05ba23be296085313abd8d7d5075d962084f5d38.patch
- source = 0cc65e2f420af45f78d190ac2af64810a148bb31.patch
- source = cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch
- source = fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch
- source = 8dd069a1e54c5b47e107f6df0db6ceb03e50c72d.patch
- source = 42e0d6b3f60b06bbe55b3ebad7ffc6edbf16e7e0.patch
- sha256sums = 130d29e6d6b8c1994017deba2acca05a4bf83ba1e169635ec8c5c7878abe0696
- sha256sums = bc4455b318bb26f44fe50a8e07292b7654c795ff2a1629a788ea749f6c8bac81
- sha256sums = 88a34bb93bca4ae5865f6c70d7d73f3a0009e5137ba2346a8446c6e206e51b20
- sha256sums = 0cde21948f01baaa31a9a5f8af76444c7151ad39a0bc45d8e04de8b07837f0ad
- sha256sums = 1644550a9be35253fe0a353fc004bd8576de3b85a6b21b92cbb0a87c03f37894
- sha256sums = 4275689c2d4493ddcda3a40309a6bbdcdf6323bed80ca2e011138cdcd88da852
- sha256sums = 629df2552826dc93446e3a7048dfd405663229f8882fa36537edeca012ba03ee
- sha256sums = 441ae8cb636307f76e3907d755b1c41df6f16c84f04d5187f1bb0a9fda24c094
+ source = git+https://gitlab.gnome.org/World/planner.git#commit=9e50bb29c7bf5ad6498172d7e29671e7734fc42a
+ sha256sums = SKIP
pkgname = planner
-
diff --git a/05ba23be296085313abd8d7d5075d962084f5d38.patch b/05ba23be296085313abd8d7d5075d962084f5d38.patch
deleted file mode 100644
index 591b2f20d948..000000000000
--- a/05ba23be296085313abd8d7d5075d962084f5d38.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 05ba23be296085313abd8d7d5075d962084f5d38 Mon Sep 17 00:00:00 2001
-From: Alexandre Franke <alexandre.franke@gmail.com>
-Date: Wed, 14 Mar 2012 10:52:25 +0000
-Subject: Better use of fields in the .desktop file
-
-https://bugzilla.gnome.org/show_bug.cgi?id=672033
----
-diff --git a/data/planner.desktop.in.in b/data/planner.desktop.in.in
-index af61d34..30eb921 100644
---- a/data/planner.desktop.in.in
-+++ b/data/planner.desktop.in.in
-@@ -1,6 +1,10 @@
- [Desktop Entry]
--_Name=Project Management
--_Comment=Planner Project Management
-+Version=1.0
-+_Name=Planner
-+_GenericName=Project Management
-+_X-GNOME-FullName=Planner Project Management
-+_Comment=Handle the tasks, resources, and cost of your projects
-+_Keywords=Gantt;Chart;Critical path;Relationship;Dependency;WBS;
- Exec=planner %F
- Icon=gnome-planner.png
- Terminal=false
---
-cgit v0.9.2
diff --git a/0cc65e2f420af45f78d190ac2af64810a148bb31.patch b/0cc65e2f420af45f78d190ac2af64810a148bb31.patch
deleted file mode 100644
index de5a64c37045..000000000000
--- a/0cc65e2f420af45f78d190ac2af64810a148bb31.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0cc65e2f420af45f78d190ac2af64810a148bb31 Mon Sep 17 00:00:00 2001
-From: Luis Menina <liberforce@freeside.fr>
-Date: Mon, 11 Mar 2013 00:00:44 +0000
-Subject: Don't crash on an empty print preview, just provide an empty preview.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=581282
----
-diff --git a/src/planner-print-job.c b/src/planner-print-job.c
-index 6334037..96267a0 100644
---- a/src/planner-print-job.c
-+++ b/src/planner-print-job.c
-@@ -237,17 +237,7 @@ print_job_draw_page (GtkPrintOperation *operation,
-
- l = priv->views;
-
-- /* Abort if there is nothing to print.
-- *
-- * A better solution would be to set the number of pages to print to 0
-- * in print_job_begin_print, but 0 is not a valid value for
-- * gtk_print_operation_set_n_pages.
-- */
-- if(!l) {
-- return;
-- }
--
-- while (!page_found) {
-+ while (! page_found && l != NULL) {
- v = PLANNER_VIEW (l->data);
-
- pages_in_view = planner_view_print_get_n_pages (v);
-@@ -258,8 +248,6 @@ print_job_draw_page (GtkPrintOperation *operation,
- } else {
- page_nr -= pages_in_view;
- l = l->next;
--
-- g_assert (l != NULL);
- }
- }
- }
---
-cgit v0.9.2
diff --git a/42e0d6b3f60b06bbe55b3ebad7ffc6edbf16e7e0.patch b/42e0d6b3f60b06bbe55b3ebad7ffc6edbf16e7e0.patch
deleted file mode 100644
index f6a717986d8d..000000000000
--- a/42e0d6b3f60b06bbe55b3ebad7ffc6edbf16e7e0.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 42e0d6b3f60b06bbe55b3ebad7ffc6edbf16e7e0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
-Date: Tue, 5 Jun 2012 21:36:41 +0300
-Subject: [PATCH] Install PNG icon to datadir/icons/hicolor per the XDG icon
- spec.
-
-http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html#install_icons
-
-https://bugzilla.gnome.org/show_bug.cgi?id=677297
----
- data/images/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/images/Makefile.am b/data/images/Makefile.am
-index 671d7a0..1bbdd6e 100644
---- a/data/images/Makefile.am
-+++ b/data/images/Makefile.am
-@@ -21,7 +21,7 @@ images_DATA = \
- mimeiconsdir = $(datadir)/icons/hicolor/48x48/mimetypes
- mimeicons_DATA = gnome-mime-application-x-planner.png
-
--pixmapdir = $(datadir)/pixmaps
-+pixmapdir = $(datadir)/icons/hicolor/48x48/apps
- pixmap_DATA = gnome-planner.png
-
- svgiconsdir = $(datadir)/icons/hicolor/scalable/apps
---
-2.18.1
-
diff --git a/8dd069a1e54c5b47e107f6df0db6ceb03e50c72d.patch b/8dd069a1e54c5b47e107f6df0db6ceb03e50c72d.patch
deleted file mode 100644
index 3d4953f552a5..000000000000
--- a/8dd069a1e54c5b47e107f6df0db6ceb03e50c72d.patch
+++ /dev/null
@@ -1,296 +0,0 @@
-From 8dd069a1e54c5b47e107f6df0db6ceb03e50c72d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
-Date: Tue, 5 Jun 2012 21:27:04 +0300
-Subject: [PATCH] Add SVG icon by Frederik Elwert.
-
-https://mail.gnome.org/archives/planner-dev-list/2012-March/msg00000.html
-
-https://bugzilla.gnome.org/show_bug.cgi?id=677297
----
- data/images/Makefile.am | 6 +-
- data/images/gnome-planner.svg | 256 ++++++++++++++++++++++++++++++++++
- 2 files changed, 261 insertions(+), 1 deletion(-)
- create mode 100644 data/images/gnome-planner.svg
-
-diff --git a/data/images/Makefile.am b/data/images/Makefile.am
-index efaed99..671d7a0 100644
---- a/data/images/Makefile.am
-+++ b/data/images/Makefile.am
-@@ -24,7 +24,11 @@ mimeicons_DATA = gnome-mime-application-x-planner.png
- pixmapdir = $(datadir)/pixmaps
- pixmap_DATA = gnome-planner.png
-
-+svgiconsdir = $(datadir)/icons/hicolor/scalable/apps
-+svgicons_DATA = gnome-planner.svg
-+
- EXTRA_DIST = \
- $(images_DATA) \
-- $(mimeicons_DATA)
-+ $(mimeicons_DATA) \
-+ $(svgicons_DATA)
-
-diff --git a/data/images/gnome-planner.svg b/data/images/gnome-planner.svg
-new file mode 100644
-index 0000000..164d1ed
---- /dev/null
-+++ b/data/images/gnome-planner.svg
-@@ -0,0 +1,256 @@
-+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-+<!-- Created with Inkscape (http://www.inkscape.org/) -->
-+
-+<svg
-+ xmlns:dc="http://purl.org/dc/elements/1.1/"
-+ xmlns:cc="http://creativecommons.org/ns#"
-+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-+ xmlns:svg="http://www.w3.org/2000/svg"
-+ xmlns="http://www.w3.org/2000/svg"
-+ xmlns:xlink="http://www.w3.org/1999/xlink"
-+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-+ width="48"
-+ height="48"
-+ id="svg2"
-+ version="1.1"
-+ inkscape:version="0.48.3.1 r9886"
-+ sodipodi:docname="gnome-planner.svg">
-+ <defs
-+ id="defs4">
-+ <linearGradient
-+ id="linearGradient3807">
-+ <stop
-+ style="stop-color:#c3d6eb;stop-opacity:1;"
-+ offset="0"
-+ id="stop3809" />
-+ <stop
-+ style="stop-color:#a2c0df;stop-opacity:1;"
-+ offset="1"
-+ id="stop3811" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient3799">
-+ <stop
-+ style="stop-color:#95b7db;stop-opacity:1;"
-+ offset="0"
-+ id="stop3801" />
-+ <stop
-+ style="stop-color:#729fcf;stop-opacity:1;"
-+ offset="1"
-+ id="stop3803" />
-+ </linearGradient>
-+ <linearGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient3799"
-+ id="linearGradient3805"
-+ x1="12.682274"
-+ y1="13.244147"
-+ x2="13"
-+ y2="18"
-+ gradientUnits="userSpaceOnUse" />
-+ <linearGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient3807"
-+ id="linearGradient3813"
-+ x1="12.040133"
-+ y1="13.725753"
-+ x2="13"
-+ y2="17"
-+ gradientUnits="userSpaceOnUse" />
-+ <linearGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient3799"
-+ id="linearGradient3825"
-+ gradientUnits="userSpaceOnUse"
-+ x1="12.682274"
-+ y1="13.244147"
-+ x2="13"
-+ y2="18" />
-+ <linearGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient3807"
-+ id="linearGradient3827"
-+ gradientUnits="userSpaceOnUse"
-+ x1="12.040133"
-+ y1="13.725753"
-+ x2="13"
-+ y2="17" />
-+ <linearGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient3799"
-+ id="linearGradient3835"
-+ gradientUnits="userSpaceOnUse"
-+ x1="12.682274"
-+ y1="13.244147"
-+ x2="13"
-+ y2="18" />
-+ <linearGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient3807"
-+ id="linearGradient3837"
-+ gradientUnits="userSpaceOnUse"
-+ x1="12.040133"
-+ y1="13.725753"
-+ x2="13"
-+ y2="17" />
-+ <filter
-+ id="filter3877"
-+ style="color-interpolation-filters:sRGB;"
-+ inkscape:label="Drop Shadow"
-+ y="-1"
-+ height="3"
-+ width="1.3500000000000001">
-+ <feFlood
-+ id="feFlood3879"
-+ flood-opacity="0.5"
-+ flood-color="rgb(0,0,0)"
-+ result="flood" />
-+ <feComposite
-+ id="feComposite3881"
-+ in2="SourceGraphic"
-+ in="flood"
-+ operator="in"
-+ result="composite1" />
-+ <feGaussianBlur
-+ id="feGaussianBlur3883"
-+ in="composite"
-+ stdDeviation="2"
-+ result="blur" />
-+ <feOffset
-+ id="feOffset3885"
-+ dx="2"
-+ dy="3"
-+ result="offset" />
-+ <feComposite
-+ id="feComposite3887"
-+ in2="offset"
-+ in="SourceGraphic"
-+ operator="over"
-+ result="composite2" />
-+ </filter>
-+ </defs>
-+ <sodipodi:namedview
-+ id="base"
-+ pagecolor="#ffffff"
-+ bordercolor="#666666"
-+ borderopacity="1.0"
-+ inkscape:pageopacity="0.0"
-+ inkscape:pageshadow="2"
-+ inkscape:zoom="11.583333"
-+ inkscape:cx="24"
-+ inkscape:cy="24"
-+ inkscape:document-units="px"
-+ inkscape:current-layer="layer2"
-+ showgrid="true"
-+ inkscape:window-width="1301"
-+ inkscape:window-height="744"
-+ inkscape:window-x="65"
-+ inkscape:window-y="24"
-+ inkscape:window-maximized="1"
-+ inkscape:snap-nodes="true"
-+ inkscape:snap-bbox="false">
-+ <inkscape:grid
-+ type="xygrid"
-+ id="grid3016"
-+ empspacing="5"
-+ visible="true"
-+ enabled="true"
-+ snapvisiblegridlinesonly="true" />
-+ </sodipodi:namedview>
-+ <metadata
-+ id="metadata7">
-+ <rdf:RDF>
-+ <cc:Work
-+ rdf:about="">
-+ <dc:format>image/svg+xml</dc:format>
-+ <dc:type
-+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-+ <dc:title></dc:title>
-+ </cc:Work>
-+ </rdf:RDF>
-+ </metadata>
-+ <g
-+ inkscape:label="Bitmap"
-+ inkscape:groupmode="layer"
-+ id="layer1"
-+ transform="translate(0,-1004.3622)"
-+ sodipodi:insensitive="true"
-+ style="display:none">
-+ <image
-+ y="1005.3622"
-+ x="0"
-+ id="image2993"
-+ xlink:href="file:///home/frederik/Arbeitsfl%C3%A4che/gnome-planner.png"
-+ height="45"
-+ width="47" />
-+ </g>
-+ <g
-+ inkscape:groupmode="layer"
-+ id="layer2"
-+ inkscape:label="Vector"
-+ style="display:inline">
-+ <g
-+ id="g3815"
-+ style="filter:url(#filter3877)">
-+ <rect
-+ y="12.5"
-+ x="3.5"
-+ height="6"
-+ width="25"
-+ id="rect3018"
-+ style="fill:url(#linearGradient3805);fill-opacity:1;stroke:#182f4e;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-+ <rect
-+ style="fill:none;stroke:url(#linearGradient3813);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-+ id="rect3789"
-+ width="23"
-+ height="4"
-+ x="4.5"
-+ y="13.5" />
-+ </g>
-+ <g
-+ id="g3819"
-+ transform="translate(18,10)"
-+ style="filter:url(#filter3877)">
-+ <rect
-+ style="fill:url(#linearGradient3825);fill-opacity:1;stroke:#182f4e;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-+ id="rect3821"
-+ width="18"
-+ height="6"
-+ x="3.5"
-+ y="12.5" />
-+ <rect
-+ y="13.5"
-+ x="4.5"
-+ height="4"
-+ width="16"
-+ id="rect3823"
-+ style="fill:none;stroke:url(#linearGradient3827);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-+ </g>
-+ <g
-+ id="g3829"
-+ transform="translate(7,20)"
-+ style="filter:url(#filter3877)">
-+ <rect
-+ style="fill:url(#linearGradient3835);fill-opacity:1;stroke:#182f4e;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-+ id="rect3831"
-+ width="14"
-+ height="6"
-+ x="3.5"
-+ y="12.5" />
-+ <rect
-+ y="13.5"
-+ x="4.5"
-+ height="4"
-+ width="12"
-+ id="rect3833"
-+ style="fill:none;stroke:url(#linearGradient3837);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-+ </g>
-+ <path
-+ style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3877)"
-+ d="M 3,9 3,4 40,4 40,9 39,9 C 39,7.7981496 38.20185,6 37,6 L 6,6 C 4.7981496,6 4,7.7981496 4,9 z"
-+ id="path3839"
-+ inkscape:connector-curvature="0"
-+ sodipodi:nodetypes="ccccccccc" />
-+ </g>
-+</svg>
---
-2.18.1
-
diff --git a/PKGBUILD b/PKGBUILD
index c6ddea333683..7ca1b0abed7b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,67 +1,53 @@
-# Maintainer:
+# Maintainer: Christophe Noisel <cnoisel at proton.me>
# Contributor: Balló György <ballogyor+arch at gmail dot com>
# Contributor: herb <herb@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=planner
-pkgver=0.14.6
-pkgrel=6
+pkgver=0.14.90
+pkgrel=7
pkgdesc='Project management application for GNOME'
arch=('x86_64')
license=('GPL')
url='https://wiki.gnome.org/Apps/Planner'
-depends=('libgnomecanvas' 'libxslt' 'gconf')
-makedepends=('intltool' 'gtk-doc' 'pygtk' 'rarian')
+depends=('glib2>=2.50', # glib, gmodule, gobject
+ 'gtk3>=3.10', # gtk3, gail
+ 'libxml2>=2.6.27',
+ 'libxslt>=1.1.2', #libxslt, libexslt
+ 'libgda>=5.0')
+makedepends=('meson')
options=('!emptydirs')
-source=(https://download.gnome.org/sources/planner/${pkgver%.*}/planner-$pkgver.tar.xz
- f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch
- 05ba23be296085313abd8d7d5075d962084f5d38.patch
- 0cc65e2f420af45f78d190ac2af64810a148bb31.patch
- cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch
- fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch
- 8dd069a1e54c5b47e107f6df0db6ceb03e50c72d.patch
- 42e0d6b3f60b06bbe55b3ebad7ffc6edbf16e7e0.patch)
-sha256sums=('130d29e6d6b8c1994017deba2acca05a4bf83ba1e169635ec8c5c7878abe0696'
- 'bc4455b318bb26f44fe50a8e07292b7654c795ff2a1629a788ea749f6c8bac81'
- '88a34bb93bca4ae5865f6c70d7d73f3a0009e5137ba2346a8446c6e206e51b20'
- '0cde21948f01baaa31a9a5f8af76444c7151ad39a0bc45d8e04de8b07837f0ad'
- '1644550a9be35253fe0a353fc004bd8576de3b85a6b21b92cbb0a87c03f37894'
- '4275689c2d4493ddcda3a40309a6bbdcdf6323bed80ca2e011138cdcd88da852'
- '629df2552826dc93446e3a7048dfd405663229f8882fa36537edeca012ba03ee'
- '441ae8cb636307f76e3907d755b1c41df6f16c84f04d5187f1bb0a9fda24c094')
+_commit="9e50bb29c7bf5ad6498172d7e29671e7734fc42a" # = master as of 2022-10-13
+source=("git+https://gitlab.gnome.org/World/planner.git#commit=$_commit")
+sha256sums=('SKIP')
-prepare() {
- cd $pkgname-$pkgver
- # Upstream fixes
- patch -Np1 -i ../f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch
- patch -Np1 -i ../05ba23be296085313abd8d7d5075d962084f5d38.patch
- patch -Np1 -i ../0cc65e2f420af45f78d190ac2af64810a148bb31.patch
+# https://wiki.archlinux.org/title/Meson_package_guidelines#Template
- # Remove deprecated libgnomeui dependency
- patch -Np1 -i ../cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch
- patch -Np1 -i ../fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch
-
- # Install icons to datadir/icons/hicolor
- patch -Np1 -i ../8dd069a1e54c5b47e107f6df0db6ceb03e50c72d.patch
- patch -Np1 -i ../42e0d6b3f60b06bbe55b3ebad7ffc6edbf16e7e0.patch
+build() {
+ # 'git clone' done in "./planner" directory :
+ arch-meson planner build
+ meson compile -C build
+}
- autoreconf -fi
+check() {
+ meson test -C build --print-errorlogs
}
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --disable-update-mimedb --disable-schemas-install \
- --with-gconf-schema-file-dir=/usr/share/gconf/schemas \
- PYTHON=/usr/bin/python2
+package() {
+ meson install -C build --destdir "$pkgdir"
+}
- #https://bugzilla.gnome.org/show_bug.cgi?id=656231
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+post_install() {
+ glib-compile-schemas "usr/share/glib-2.0/schemas"
+ update-mime-database "usr/share/mime"
+ gtk-update-icon-cache -qtf "usr/icons/hicolor"
+ update-desktop-database -q "usr/share/applications"
+}
- make
+post_upgrade() {
+ post_install "$1"
}
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
+post_remove() {
+ post_install "$1"
}
diff --git a/cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch b/cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch
deleted file mode 100644
index 722c59ec3675..000000000000
--- a/cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From cd2b658e83d47e8f49d1bbaf54be6433a21d3758 Mon Sep 17 00:00:00 2001
-From: Luis Menina <liberforce@freeside.fr>
-Date: Mon, 04 Mar 2013 17:10:26 +0000
-Subject: Remove deprecated GnomeEntry.
-
-It is replaced by GtkEntry. This means we lose the history
-functionality, but that could be reimplemented using GtkComboBoxText
-with an entry.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=589045
----
-diff --git a/data/glade/sql.glade b/data/glade/sql.glade
-index 2b12b85..f673ae0 100644
---- a/data/glade/sql.glade
-+++ b/data/glade/sql.glade
-@@ -165,24 +165,16 @@
- </child>
-
- <child>
-- <widget class="GnomeEntry" id="server_entry">
-+ <widget class="GtkEntry" id="server_entry">
- <property name="visible">True</property>
-- <property name="history_id">database_server</property>
-- <property name="max_saved">10</property>
--
-- <child internal-child="entry">
-- <widget class="GtkEntry" id="combo-entry1">
-- <property name="visible">True</property>
-- <property name="can_focus">True</property>
-- <property name="editable">True</property>
-- <property name="visibility">True</property>
-- <property name="max_length">0</property>
-- <property name="text" translatable="yes"></property>
-- <property name="has_frame">True</property>
-- <property name="invisible_char" translatable="yes">*</property>
-- <property name="activates_default">True</property>
-- </widget>
-- </child>
-+ <property name="can_focus">True</property>
-+ <property name="editable">True</property>
-+ <property name="visibility">True</property>
-+ <property name="max_length">0</property>
-+ <property name="text" translatable="yes"></property>
-+ <property name="has_frame">True</property>
-+ <property name="invisible_char" translatable="yes">*</property>
-+ <property name="activates_default">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
-@@ -194,24 +186,16 @@
- </child>
-
- <child>
-- <widget class="GnomeEntry" id="user_entry">
-+ <widget class="GtkEntry" id="user_entry">
- <property name="visible">True</property>
-- <property name="history_id">database_user</property>
-- <property name="max_saved">10</property>
--
-- <child internal-child="entry">
-- <widget class="GtkEntry" id="combo-entry2">
-- <property name="visible">True</property>
-- <property name="can_focus">True</property>
-- <property name="editable">True</property>
-- <property name="visibility">True</property>
-- <property name="max_length">0</property>
-- <property name="text" translatable="yes"></property>
-- <property name="has_frame">True</property>
-- <property name="invisible_char" translatable="yes">*</property>
-- <property name="activates_default">True</property>
-- </widget>
-- </child>
-+ <property name="can_focus">True</property>
-+ <property name="editable">True</property>
-+ <property name="visibility">True</property>
-+ <property name="max_length">0</property>
-+ <property name="text" translatable="yes"></property>
-+ <property name="has_frame">True</property>
-+ <property name="invisible_char" translatable="yes">*</property>
-+ <property name="activates_default">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
-@@ -248,24 +232,16 @@
- </child>
-
- <child>
-- <widget class="GnomeEntry" id="db_entry">
-+ <widget class="GtkEntry" id="db_entry">
- <property name="visible">True</property>
-- <property name="history_id">database_name</property>
-- <property name="max_saved">10</property>
--
-- <child internal-child="entry">
-- <widget class="GtkEntry" id="combo-entry3">
-- <property name="visible">True</property>
-- <property name="can_focus">True</property>
-- <property name="editable">True</property>
-- <property name="visibility">True</property>
-- <property name="max_length">0</property>
-- <property name="text" translatable="yes"></property>
-- <property name="has_frame">True</property>
-- <property name="invisible_char" translatable="yes">*</property>
-- <property name="activates_default">True</property>
-- </widget>
-- </child>
-+ <property name="can_focus">True</property>
-+ <property name="editable">True</property>
-+ <property name="visibility">True</property>
-+ <property name="max_length">0</property>
-+ <property name="text" translatable="yes"></property>
-+ <property name="has_frame">True</property>
-+ <property name="invisible_char" translatable="yes">*</property>
-+ <property name="activates_default">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
-diff --git a/src/planner-sql-plugin.c b/src/planner-sql-plugin.c
-index 14a088c..ea2f46a 100644
---- a/src/planner-sql-plugin.c
-+++ b/src/planner-sql-plugin.c
-@@ -27,7 +27,6 @@
- #include <stdlib.h>
- #include <glib.h>
- #include <glib/gi18n.h>
--#include <libgnomeui/gnome-entry.h>
- #include <glade/glade.h>
- #include <gtk/gtk.h>
- #include <libgda/libgda.h>
-@@ -950,12 +949,9 @@ sql_plugin_retrieve_db_values (PlannerPlugin *plugin,
-
- gtk_window_set_title (GTK_WINDOW (dialog), title);
-
-- server_entry = gnome_entry_gtk_entry (
-- GNOME_ENTRY (glade_xml_get_widget (gui, "server_entry")));
-- db_entry = gnome_entry_gtk_entry (
-- GNOME_ENTRY (glade_xml_get_widget (gui, "db_entry")));
-- user_entry = gnome_entry_gtk_entry (
-- GNOME_ENTRY (glade_xml_get_widget (gui, "user_entry")));
-+ server_entry = glade_xml_get_widget (gui, "server_entry");
-+ db_entry = glade_xml_get_widget (gui, "db_entry");
-+ user_entry = glade_xml_get_widget (gui, "user_entry");
- password_entry = glade_xml_get_widget (gui, "password_entry");
-
- str = planner_conf_get_string (CONF_SERVER, NULL);
---
-cgit v0.9.2
diff --git a/f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch b/f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch
deleted file mode 100644
index 1ee60f528c63..000000000000
--- a/f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From f9840c342e4b5767ee35f0d326b7f7eaf56850ed Mon Sep 17 00:00:00 2001
-From: Alexandre Franke <alexandre.franke@gmail.com>
-Date: Mon, 05 Mar 2012 17:22:56 +0000
-Subject: Fix for broken "open file on startup" behaviour
-
-Switch to gtk_init_with_args from GnomeProgam broke opening of files from command line and when double clicking on file in file browser.
-
-Based on patches 193670 and 193835 by Maxim Zakharov.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=656373
----
-diff --git a/src/planner-main.c b/src/planner-main.c
-index cdeb8ea..c0aabd2 100644
---- a/src/planner-main.c
-+++ b/src/planner-main.c
-@@ -37,7 +37,7 @@ static gchar **args_remaining = NULL;
-
- static GOptionEntry options[] = {
- { "geometry", 'g', 0, G_OPTION_ARG_STRING, &geometry, N_("Create the initial window with the given geometry."), N_("GEOMETRY")},
-- { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &args_remaining, NULL, N_("FILES") },
-+ { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &args_remaining, NULL, N_("FILES|URIs") },
- { NULL }
- };
-
-@@ -92,26 +92,27 @@ main (int argc, char **argv)
-
- gtk_widget_show_all (main_window);
-
-- if (argc > 1) {
-- i = 1;
-- while (argv[i]) {
-- if (g_str_has_prefix (argv[i], "file:")) {
-+ if (args_remaining != NULL) {
-+ for (i = 0; args_remaining[i]; i++) {
-+ gchar *scheme = g_uri_parse_scheme(args_remaining[i]);
-+ if (scheme != NULL) {
- planner_window_open_in_existing_or_new (
-- PLANNER_WINDOW (main_window), argv[i], FALSE);
-+ PLANNER_WINDOW (main_window), args_remaining[i], FALSE);
-+ g_free(scheme);
- } else {
- gchar *uri;
-
-- if (!g_path_is_absolute (argv[i])) {
-+ if (!g_path_is_absolute (args_remaining[i])) {
- /* Relative path. */
- gchar *cwd, *tmp;
-
- cwd = g_get_current_dir ();
-- tmp = g_build_filename (cwd, argv[i], NULL);
-+ tmp = g_build_filename (cwd, args_remaining[i], NULL);
- uri = g_filename_to_uri (tmp, NULL, NULL);
- g_free (tmp);
- g_free (cwd);
- } else {
-- uri = g_filename_to_uri (argv[i], NULL, NULL);
-+ uri = g_filename_to_uri (args_remaining[i], NULL, NULL);
- }
-
- if (uri) {
-@@ -120,8 +121,6 @@ main (int argc, char **argv)
- g_free (uri);
- }
- }
--
-- i++;
- }
- }
-
-diff --git a/src/planner-window.c b/src/planner-window.c
-index 73f1766..b0536c3 100644
---- a/src/planner-window.c
-+++ b/src/planner-window.c
-@@ -1726,36 +1726,24 @@ planner_window_open_in_existing_or_new (PlannerWindow *window,
- {
- PlannerWindowPriv *priv;
- GtkWidget *new_window;
-- gchar *filename;
- gboolean ret;
-
- priv = window->priv;
--
-- filename = g_filename_from_uri (uri, NULL, NULL);
-- if (!filename) {
-- return FALSE;
-- }
--
- if (mrp_project_is_empty (priv->project)) {
-- ret = planner_window_open (window, filename, internal);
-- g_free (filename);
-+ ret = planner_window_open (window, uri, internal);
- return ret;
- } else {
- new_window = planner_application_new_window (priv->application);
-- if (planner_window_open (PLANNER_WINDOW (new_window), filename, internal)) {
-- g_free (filename);
-+ if (planner_window_open (PLANNER_WINDOW (new_window), uri, internal)) {
- gtk_widget_show_all (new_window);
- return TRUE;
- } else {
-- g_free (filename);
- g_signal_emit (new_window, signals[CLOSED], 0, NULL);
- gtk_widget_destroy (new_window);
- return FALSE;
- }
- }
-
-- g_free (filename);
--
- return FALSE;
- }
-
---
-cgit v0.9.2
diff --git a/fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch b/fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch
deleted file mode 100644
index 7c1b1d5efaf6..000000000000
--- a/fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From fd8da8994f7006b9fcefc90d2fe5c2b484c7871e Mon Sep 17 00:00:00 2001
-From: Luis Menina <liberforce@freeside.fr>
-Date: Mon, 04 Mar 2013 13:42:22 +0000
-Subject: Remove deprecated libgnomeui.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=589045
----
-diff --git a/README b/README
-index e6d5c31..b2489ef 100644
---- a/README
-+++ b/README
-@@ -59,7 +59,6 @@ Dependencies:
- GLIB 2.6.0
- GTK 2.14.0
- LIBGNOMECANVAS 2.10.0
--LIBGNOMEUI 2.10.0
- LIBGLADE 2.3.0
- GNOME_VFS 2.10.0
- GCONF 2.10.0
-diff --git a/configure.in b/configure.in
-index 9f3d112..06568fd 100644
---- a/configure.in
-+++ b/configure.in
-@@ -67,7 +67,6 @@ dnl it too, or it will never make it into the spec file!
- GLIB_REQUIRED=2.6.0
- GTK_REQUIRED=2.14.0
- LIBGNOMECANVAS_REQUIRED=2.10.0
--LIBGNOMEUI_REQUIRED=2.10.0
- LIBGLADE_REQUIRED=2.3.0
- GNOME_VFS_REQUIRED=2.10.0
- GCONF_REQUIRED=2.10.0
-@@ -116,7 +115,6 @@ PKG_CHECK_MODULES(PLANNER,
- gobject-2.0 gmodule-2.0
- gtk+-2.0 >= $GTK_REQUIRED
- libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED
-- libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
- libglade-2.0 >= $LIBGLADE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- ])
---
-cgit v0.9.2