[pkgsrc/trunk]: pkgsrc libindicator: Make this the GTK3 version.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc libindicator: Make this the GTK3 version.
From: nia <nia%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 11:53:31 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/03dc4a1b0f9e
branches:  trunk
changeset: 401032:03dc4a1b0f9e
user:      nia <nia%pkgsrc.org@localhost>
date:      Mon Sep 09 13:25:46 2019 +0000

description:
libindicator: Make this the GTK3 version.

Nothing is using the GTK2 version.

Bump PKGREVISIONs

diffstat:

 devel/libappindicator/Makefile                     |   6 ++--
 devel/libappindicator/buildlink3.mk                |   4 +-
 devel/libindicator-tools/DESCR                     |   2 -
 devel/libindicator-tools/Makefile                  |  16 -------------
 devel/libindicator-tools/PLIST                     |   3 --
 devel/libindicator/DESCR                           |   2 +
 devel/libindicator/Makefile                        |  27 ++++++++++++++++-----
 devel/libindicator/Makefile.common                 |  26 ---------------------
 devel/libindicator/PLIST                           |  18 +++++++-------
 devel/libindicator/buildlink3.mk                   |   6 ++--
 devel/libindicator/distinfo                        |   3 +-
 devel/libindicator/patches/patch-tools_Makefile.in |  13 ----------
 devel/libindicator3/DESCR                          |   4 ---
 devel/libindicator3/Makefile                       |  15 ------------
 devel/libindicator3/PLIST                          |   9 -------
 devel/libindicator3/buildlink3.mk                  |  15 ------------
 x11/mate-indicator-applet/Makefile                 |   6 ++--
 x11/xfce4-indicator-plugin/Makefile                |   6 ++--
 18 files changed, 46 insertions(+), 135 deletions(-)

diffs (truncated from 324 to 300 lines):

diff -r 68cd2eb4b7c4 -r 03dc4a1b0f9e devel/libappindicator/Makefile
--- a/devel/libappindicator/Makefile    Mon Sep 09 13:01:55 2019 +0000
+++ b/devel/libappindicator/Makefile    Mon Sep 09 13:25:46 2019 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2019/09/09 13:01:55 nia Exp $
+# $NetBSD: Makefile,v 1.17 2019/09/09 13:25:47 nia Exp $
 
 DISTNAME=      libappindicator-12.10.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  https://launchpad.net/libappindicator/12.10/12.10.0/+download/
 
@@ -27,7 +27,7 @@
 
 PYTHON_VERSIONS_ACCEPTED=      27 # py-gtk2
 
-.include "../../devel/libindicator3/buildlink3.mk"
+.include "../../devel/libindicator/buildlink3.mk"
 .include "../../devel/libdbusmenu-gtk3/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
diff -r 68cd2eb4b7c4 -r 03dc4a1b0f9e devel/libappindicator/buildlink3.mk
--- a/devel/libappindicator/buildlink3.mk       Mon Sep 09 13:01:55 2019 +0000
+++ b/devel/libappindicator/buildlink3.mk       Mon Sep 09 13:25:46 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2019/09/09 12:59:06 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2019/09/09 13:25:47 nia Exp $
 
 BUILDLINK_TREE+=       libappindicator
 
@@ -9,7 +9,7 @@
 BUILDLINK_ABI_DEPENDS.libappindicator+=        libappindicator>=12.10.0nb1
 BUILDLINK_PKGSRCDIR.libappindicator?=  ../../devel/libappindicator
 
-.include "../../devel/libindicator3/buildlink3.mk"
+.include "../../devel/libindicator/buildlink3.mk"
 .include "../../devel/libdbusmenu-gtk3/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .endif # LIBAPPINDICATOR_BUILDLINK3_MK
diff -r 68cd2eb4b7c4 -r 03dc4a1b0f9e devel/libindicator-tools/DESCR
--- a/devel/libindicator-tools/DESCR    Mon Sep 09 13:01:55 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-A set of symbols and convience functions that all indicators would
-like to use.
diff -r 68cd2eb4b7c4 -r 03dc4a1b0f9e devel/libindicator-tools/Makefile
--- a/devel/libindicator-tools/Makefile Mon Sep 09 13:01:55 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2019/07/21 22:24:38 wiz Exp $
-
-USE_GTK_VERSION=2
-
-PKGREVISION= 8
-.include "../../devel/libindicator/Makefile.common"
-
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-COMMENT=       GTK+2 symbols and convience functions for indicators
-PKGNAME=       ${DISTNAME:S/-/-tools-/}
-
-INSTALL_DIRS=  tools
-
-.include "../../devel/libindicator/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 68cd2eb4b7c4 -r 03dc4a1b0f9e devel/libindicator-tools/PLIST
--- a/devel/libindicator-tools/PLIST    Mon Sep 09 13:01:55 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2016/05/20 22:23:43 youri Exp $
-libexec/indicator-loader
-share/libindicator/80indicator-debugging
diff -r 68cd2eb4b7c4 -r 03dc4a1b0f9e devel/libindicator/DESCR
--- a/devel/libindicator/DESCR  Mon Sep 09 13:01:55 2019 +0000
+++ b/devel/libindicator/DESCR  Mon Sep 09 13:25:46 2019 +0000
@@ -1,2 +1,4 @@
 A set of symbols and convience functions that all indicators would
 like to use.
+
+This package provide GTK3 API.
diff -r 68cd2eb4b7c4 -r 03dc4a1b0f9e devel/libindicator/Makefile
--- a/devel/libindicator/Makefile       Mon Sep 09 13:01:55 2019 +0000
+++ b/devel/libindicator/Makefile       Mon Sep 09 13:25:46 2019 +0000
@@ -1,14 +1,27 @@
-# $NetBSD: Makefile,v 1.9 2019/07/21 22:24:01 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2019/09/09 13:25:47 nia Exp $
 
-USE_GTK_VERSION=2
-
-PKGREVISION= 8
-.include "Makefile.common"
+DISTNAME=      libindicator-12.10.1
+PKGREVISION=   9
+CATEGORIES=    devel
+MASTER_SITES=  https://launchpad.net/libindicator/12.10/${PKGVERSION_NOREV}/+download/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-COMMENT=       GTK+2 symbols and convience functions for indicators
+HOMEPAGE=      https://launchpad.net/libindicator
+COMMENT=       GTK+3 symbols and convience functions for indicators
+LICENSE=       gnu-gpl-v3
+
+EXTRACT_USING= gtar
+GNU_CONFIGURE= yes
+USE_LIBTOOL=   yes
+USE_TOOLS+=    gmake pkg-config
 
 INSTALL_DIRS=  libindicator
 
-.include "../../x11/gtk2/buildlink3.mk"
+BUILDLINK_TRANSFORM+=  rm:-Werror
+PKGCONFIG_OVERRIDE+=   libindicator/indicator-0.4.pc.in.in
+PKGCONFIG_OVERRIDE+=   libindicator/indicator3-0.4.pc.in.in
+
+CONFIGURE_ARGS+=       --with-gtk=3
+
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 68cd2eb4b7c4 -r 03dc4a1b0f9e devel/libindicator/Makefile.common
--- a/devel/libindicator/Makefile.common        Mon Sep 09 13:01:55 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile.common,v 1.1 2016/05/20 21:32:24 youri Exp $
-#
-# used by devel/libindicator3/Makefile
-# used by devel/libindicator-tools/Makefile
-
-DISTNAME=      libindicator-12.10.1
-CATEGORIES=    devel
-MASTER_SITES=  https://launchpad.net/libindicator/12.10/${PKGVERSION_NOREV}/+download/
-
-HOMEPAGE=      https://launchpad.net/libindicator
-LICENSE=       gnu-gpl-v3
-
-DISTINFO_FILE= ${.CURDIR}/../../devel/libindicator/distinfo
-PATCHDIR=      ${.CURDIR}/../../devel/libindicator/patches
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL=   yes
-USE_TOOLS+=    gmake pkg-config
-
-EXTRACT_USING= gtar
-
-BUILDLINK_TRANSFORM+=  rm:-Werror
-PKGCONFIG_OVERRIDE+=   libindicator/indicator-0.4.pc.in.in
-PKGCONFIG_OVERRIDE+=   libindicator/indicator3-0.4.pc.in.in
-
-CONFIGURE_ARGS+=       --with-gtk=${USE_GTK_VERSION}
diff -r 68cd2eb4b7c4 -r 03dc4a1b0f9e devel/libindicator/PLIST
--- a/devel/libindicator/PLIST  Mon Sep 09 13:01:55 2019 +0000
+++ b/devel/libindicator/PLIST  Mon Sep 09 13:25:46 2019 +0000
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2016/05/20 21:32:24 youri Exp $
-include/libindicator-0.4/libindicator/indicator-desktop-shortcuts.h
-include/libindicator-0.4/libindicator/indicator-image-helper.h
-include/libindicator-0.4/libindicator/indicator-object.h
-include/libindicator-0.4/libindicator/indicator-service-manager.h
-include/libindicator-0.4/libindicator/indicator-service.h
-include/libindicator-0.4/libindicator/indicator.h
-lib/libindicator.la
-lib/pkgconfig/indicator-0.4.pc
+@comment $NetBSD: PLIST,v 1.2 2019/09/09 13:25:47 nia Exp $
+include/libindicator3-0.4/libindicator/indicator-desktop-shortcuts.h
+include/libindicator3-0.4/libindicator/indicator-image-helper.h
+include/libindicator3-0.4/libindicator/indicator-object.h
+include/libindicator3-0.4/libindicator/indicator-service-manager.h
+include/libindicator3-0.4/libindicator/indicator-service.h
+include/libindicator3-0.4/libindicator/indicator.h
+lib/libindicator3.la
+lib/pkgconfig/indicator3-0.4.pc
diff -r 68cd2eb4b7c4 -r 03dc4a1b0f9e devel/libindicator/buildlink3.mk
--- a/devel/libindicator/buildlink3.mk  Mon Sep 09 13:01:55 2019 +0000
+++ b/devel/libindicator/buildlink3.mk  Mon Sep 09 13:25:46 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2019/07/21 22:24:01 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2019/09/09 13:25:47 nia Exp $
 
 BUILDLINK_TREE+=       libindicator
 
@@ -6,10 +6,10 @@
 LIBINDICATOR_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libindicator+=   libindicator>=12.10.1
-BUILDLINK_ABI_DEPENDS.libindicator?=   libindicator>=12.10.1nb8
+BUILDLINK_ABI_DEPENDS.libindicator+=   libindicator>=12.10.1nb9
 BUILDLINK_PKGSRCDIR.libindicator?=     ../../devel/libindicator
 
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .endif # LIBINDICATOR_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libindicator
diff -r 68cd2eb4b7c4 -r 03dc4a1b0f9e devel/libindicator/distinfo
--- a/devel/libindicator/distinfo       Mon Sep 09 13:01:55 2019 +0000
+++ b/devel/libindicator/distinfo       Mon Sep 09 13:25:46 2019 +0000
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.3 2017/03/23 17:06:48 joerg Exp $
+$NetBSD: distinfo,v 1.4 2019/09/09 13:25:47 nia Exp $
 
 SHA1 (libindicator-12.10.1.tar.gz) = 25c8a0a150651ee6b2198df3f36fcbb49f0295c2
 RMD160 (libindicator-12.10.1.tar.gz) = c5353a3ee5b9b24fac0cb2a7b620a23c406055af
 SHA512 (libindicator-12.10.1.tar.gz) = d6d77d0309b15cf6b52539323920ab0c1594cb1c1cef8a8d67cd0f76f8ceeeac28eb6db6227563df1932e6f1fadcffac68d82982182b745257dfaf91f1c945af
 Size (libindicator-12.10.1.tar.gz) = 427764 bytes
 SHA1 (patch-configure) = 3af0c7c242613fac3727620dcca1aa5e51d0fa6f
-SHA1 (patch-tools_Makefile.in) = 9988879025dd4cc541407958e83b0d69eea1926c
diff -r 68cd2eb4b7c4 -r 03dc4a1b0f9e devel/libindicator/patches/patch-tools_Makefile.in
--- a/devel/libindicator/patches/patch-tools_Makefile.in        Mon Sep 09 13:01:55 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-tools_Makefile.in,v 1.1 2016/07/02 14:41:24 joerg Exp $
-
---- tools/Makefile.in.orig     2016-07-02 13:52:36.000000000 +0000
-+++ tools/Makefile.in
-@@ -291,7 +291,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--@USE_GTK3_FALSE@INDICATOR_LIB = -lindicator
-+@USE_GTK3_FALSE@INDICATOR_LIB = ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lindicator
- @USE_GTK3_TRUE@INDICATOR_LIB = -lindicator3
- @USE_GTK3_FALSE@VER = 
- @USE_GTK3_TRUE@VER = 3
diff -r 68cd2eb4b7c4 -r 03dc4a1b0f9e devel/libindicator3/DESCR
--- a/devel/libindicator3/DESCR Mon Sep 09 13:01:55 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-A set of symbols and convience functions that all indicators would
-like to use.
-
-This package provide GTK3 API.
diff -r 68cd2eb4b7c4 -r 03dc4a1b0f9e devel/libindicator3/Makefile
--- a/devel/libindicator3/Makefile      Mon Sep 09 13:01:55 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2019/07/21 22:24:01 wiz Exp $
-
-USE_GTK_VERSION=3
-
-PKGREVISION= 9
-.include "../../devel/libindicator/Makefile.common"
-
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-COMMENT=       GTK+3 symbols and convience functions for indicators
-PKGNAME=       ${DISTNAME:S/-/3-/}
-
-INSTALL_DIRS=  libindicator
-
-.include "../../x11/gtk3/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 68cd2eb4b7c4 -r 03dc4a1b0f9e devel/libindicator3/PLIST
--- a/devel/libindicator3/PLIST Mon Sep 09 13:01:55 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2016/05/20 21:33:13 youri Exp $
-include/libindicator3-0.4/libindicator/indicator-desktop-shortcuts.h
-include/libindicator3-0.4/libindicator/indicator-image-helper.h
-include/libindicator3-0.4/libindicator/indicator-object.h
-include/libindicator3-0.4/libindicator/indicator-service-manager.h
-include/libindicator3-0.4/libindicator/indicator-service.h
-include/libindicator3-0.4/libindicator/indicator.h
-lib/libindicator3.la
-lib/pkgconfig/indicator3-0.4.pc
diff -r 68cd2eb4b7c4 -r 03dc4a1b0f9e devel/libindicator3/buildlink3.mk
--- a/devel/libindicator3/buildlink3.mk Mon Sep 09 13:01:55 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.10 2019/07/21 22:24:01 wiz Exp $
-
-BUILDLINK_TREE+=       libindicator3
-
-.if !defined(LIBINDICATOR3_BUILDLINK3_MK)
-LIBINDICATOR3_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.libindicator3+=  libindicator3>=12.10.1
-BUILDLINK_ABI_DEPENDS.libindicator3?=  libindicator3>=12.10.1nb9
-BUILDLINK_PKGSRCDIR.libindicator3?=    ../../devel/libindicator3
-
-.include "../../x11/gtk3/buildlink3.mk"
-.endif # LIBINDICATOR3_BUILDLINK3_MK
-
-BUILDLINK_TREE+=       -libindicator3
diff -r 68cd2eb4b7c4 -r 03dc4a1b0f9e x11/mate-indicator-applet/Makefile
--- a/x11/mate-indicator-applet/Makefile        Mon Sep 09 13:01:55 2019 +0000
+++ b/x11/mate-indicator-applet/Makefile        Mon Sep 09 13:25:46 2019 +0000
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.15 2019/07/21 22:26:01 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/09/09 13:25:46 nia Exp $
 
 .include "../../meta-pkgs/mate/Makefile.common"
 
 DISTNAME=      mate-indicator-applet-${VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    x11
 
 COMMENT=       MATE indicator applet
 
 .include "../../x11/mate-panel/buildlink3.mk"
-.include "../../devel/libindicator3/buildlink3.mk"
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Removed devel/libappindicator3 successor deve...
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/libappindicator libappindicator: Update COMMENT
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Removed devel/libappindicator3 successor deve...
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/libappindicator libappindicator: Update COMMENT
Indexes:
Home | Main Index | Thread Index | Old Index