pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
cinnamon-desktop: Update to 3.0.2
Module Name: pkgsrc-wip
Committed By: Youri Mouton <youri%NetBSD.org@localhost>
Pushed By: youri
Date: Tue Jul 12 18:10:50 2016 +0200
Changeset: 4002a31cf4bf74c521b5c02188d68bd6824cdef9
Modified Files:
cinnamon-desktop/DESCR
cinnamon-desktop/Makefile
cinnamon-desktop/PLIST
cinnamon-desktop/buildlink3.mk
cinnamon-desktop/distinfo
Added Files:
cinnamon-desktop/options.mk
cinnamon-desktop/patches/patch-files_Makefile.am
cinnamon-desktop/patches/patch-libcinnamon-desktop_Makefile.am
Log Message:
cinnamon-desktop: Update to 3.0.2
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4002a31cf4bf74c521b5c02188d68bd6824cdef9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
cinnamon-desktop/DESCR | 2 +-
cinnamon-desktop/Makefile | 16 ++++++-------
cinnamon-desktop/PLIST | 28 ++++++++++++++++++----
cinnamon-desktop/buildlink3.mk | 4 ++--
cinnamon-desktop/distinfo | 9 ++++---
cinnamon-desktop/options.mk | 18 ++++++++++++++
cinnamon-desktop/patches/patch-files_Makefile.am | 14 +++++++++++
.../patches/patch-libcinnamon-desktop_Makefile.am | 16 +++++++++++++
8 files changed, 88 insertions(+), 19 deletions(-)
diffs:
diff --git a/cinnamon-desktop/DESCR b/cinnamon-desktop/DESCR
index 12173ff..25b1638 100644
--- a/cinnamon-desktop/DESCR
+++ b/cinnamon-desktop/DESCR
@@ -1 +1 @@
-This is a collection of APIs
+This is a collection of APIs for the Cinnamon desktop.
diff --git a/cinnamon-desktop/Makefile b/cinnamon-desktop/Makefile
index 8b75944..0523c72 100644
--- a/cinnamon-desktop/Makefile
+++ b/cinnamon-desktop/Makefile
@@ -1,21 +1,20 @@
# $NetBSD: Makefile,v 1.2 2015/02/19 18:01:20 jihbed Exp $
-DISTNAME= cinnamon-desktop_2.2.3.orig
-PKGNAME= cinnamon-desktop-2.2.3
+DISTNAME= 3.0.2
+PKGNAME= cinnamon-desktop-3.0.2
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/c/cinnamon-desktop/}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=linuxmint/cinnamon-desktop/archive/}
MAINTAINER= pkgsrc.gnome%gmail.com@localhost
HOMEPAGE= https://github.com/linuxmint/cinnamon-desktop
COMMENT= Additional UI API for cinnamon
LICENSE= gnu-gpl-v2
-WRKSRC= ${WRKDIR}/cinnamon-desktop-2.2.3
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-GNU_CONFIGURE= yes
-USE_PKGLOCALEDIR= YES
-USE_LIBTOOL= yes
-USE_TOOLS+= gmake pkg-config automake autoreconf intltool msgfmt
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+USE_TOOLS+= gmake pkg-config automake autoreconf intltool msgfmt
BUILD_DEPENDS+= gettext-m4>=0.14.6:../../devel/gettext-m4
BUILD_DEPENDS+= gnome-common-[0-9]*:../../devel/gnome-common
@@ -25,6 +24,7 @@ PKGCONFIG_OVERRIDE+= libcinnamon-desktop/cinnamon-desktop.pc.in
pre-configure:
cd ${WRKSRC} && ${SH} ./autogen.sh
+.include "../../audio/pulseaudio/buildlink3.mk"
.include "../../devel/glib2/schemas.mk"
.include "../../devel/gobject-introspection/buildlink3.mk"
.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
diff --git a/cinnamon-desktop/PLIST b/cinnamon-desktop/PLIST
index 88ee38a..97c1d87 100644
--- a/cinnamon-desktop/PLIST
+++ b/cinnamon-desktop/PLIST
@@ -1,22 +1,35 @@
-@comment $NetBSD: PLIST,v 1.2 2015/02/19 17:53:08 jihbed Exp $
+@comment $NetBSD$
include/cinnamon-desktop/libcinnamon-desktop/cdesktop-enums.h
include/cinnamon-desktop/libcinnamon-desktop/gnome-bg-crossfade.h
include/cinnamon-desktop/libcinnamon-desktop/gnome-bg.h
include/cinnamon-desktop/libcinnamon-desktop/gnome-desktop-thumbnail.h
include/cinnamon-desktop/libcinnamon-desktop/gnome-desktop-utils.h
+include/cinnamon-desktop/libcinnamon-desktop/gnome-installer.h
include/cinnamon-desktop/libcinnamon-desktop/gnome-pnp-ids.h
include/cinnamon-desktop/libcinnamon-desktop/gnome-rr-config.h
include/cinnamon-desktop/libcinnamon-desktop/gnome-rr-labeler.h
include/cinnamon-desktop/libcinnamon-desktop/gnome-rr.h
include/cinnamon-desktop/libcinnamon-desktop/gnome-wall-clock.h
include/cinnamon-desktop/libcinnamon-desktop/gnome-xkb-info.h
-lib/girepository-1.0/CDesktopEnums-3.0.typelib
-lib/girepository-1.0/CinnamonDesktop-3.0.typelib
+include/cinnamon-desktop/libcvc/gvc-channel-map.h
+include/cinnamon-desktop/libcvc/gvc-mixer-card.h
+include/cinnamon-desktop/libcvc/gvc-mixer-control.h
+include/cinnamon-desktop/libcvc/gvc-mixer-sink-input.h
+include/cinnamon-desktop/libcvc/gvc-mixer-source-output.h
+include/cinnamon-desktop/libcvc/gvc-mixer-source.h
+include/cinnamon-desktop/libcvc/gvc-mixer-stream.h
+include/cinnamon-desktop/libcvc/gvc-mixer-ui-device.h
+${PLIST.introspection}lib/girepository-1.0/CDesktopEnums-3.0.typelib
+${PLIST.introspection}lib/girepository-1.0/CinnamonDesktop-3.0.typelib
+${PLIST.introspection}lib/girepository-1.0/Cvc-1.0.typelib
lib/libcinnamon-desktop.la
+lib/libcvc.la
lib/pkgconfig/cinnamon-desktop.pc
+lib/pkgconfig/cvc.pc
libexec/cinnamon-rr-debug
-share/gir-1.0/CDesktopEnums-3.0.gir
-share/gir-1.0/CinnamonDesktop-3.0.gir
+${PLIST.introspection}share/gir-1.0/CDesktopEnums-3.0.gir
+${PLIST.introspection}share/gir-1.0/CinnamonDesktop-3.0.gir
+${PLIST.introspection}share/gir-1.0/Cvc-1.0.gir
share/glib-2.0/schemas/org.cinnamon.desktop.a11y.applications.gschema.xml
share/glib-2.0/schemas/org.cinnamon.desktop.a11y.keyboard.gschema.xml
share/glib-2.0/schemas/org.cinnamon.desktop.a11y.magnifier.gschema.xml
@@ -26,8 +39,13 @@ share/glib-2.0/schemas/org.cinnamon.desktop.default-applications.gschema.xml
share/glib-2.0/schemas/org.cinnamon.desktop.enums.xml
share/glib-2.0/schemas/org.cinnamon.desktop.input-sources.gschema.xml
share/glib-2.0/schemas/org.cinnamon.desktop.interface.gschema.xml
+share/glib-2.0/schemas/org.cinnamon.desktop.keybindings.gschema.xml
+share/glib-2.0/schemas/org.cinnamon.desktop.keybindings.media-keys.gschema.xml
+share/glib-2.0/schemas/org.cinnamon.desktop.keybindings.wm.gschema.xml
share/glib-2.0/schemas/org.cinnamon.desktop.lockdown.gschema.xml
share/glib-2.0/schemas/org.cinnamon.desktop.media-handling.gschema.xml
+share/glib-2.0/schemas/org.cinnamon.desktop.notifications.gschema.xml
+share/glib-2.0/schemas/org.cinnamon.desktop.privacy.gschema.xml
share/glib-2.0/schemas/org.cinnamon.desktop.screensaver.gschema.xml
share/glib-2.0/schemas/org.cinnamon.desktop.session.gschema.xml
share/glib-2.0/schemas/org.cinnamon.desktop.sound.gschema.xml
diff --git a/cinnamon-desktop/buildlink3.mk b/cinnamon-desktop/buildlink3.mk
index ef37539..408dfd4 100644
--- a/cinnamon-desktop/buildlink3.mk
+++ b/cinnamon-desktop/buildlink3.mk
@@ -5,8 +5,8 @@ BUILDLINK_TREE+= cinnamon-desktop
.if !defined(CINNAMON_DESKTOP_BUILDLINK3_MK)
CINNAMON_DESKTOP_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.cinnamon-desktop+= cinnamon-desktop>=2.2.3
-BUILDLINK_PKGSRCDIR.cinnamon-desktop?= ../../wip/cinnamon-desktop
+BUILDLINK_API_DEPENDS.cinnamon-desktop+= cinnamon-desktop>=3.0.2
+BUILDLINK_PKGSRCDIR.cinnamon-desktop?= ../../wip/cinnamon-desktop
.include "../../x11/gtk3/buildlink3.mk"
.include "../../x11/libxkbfile/buildlink3.mk"
diff --git a/cinnamon-desktop/distinfo b/cinnamon-desktop/distinfo
index a7882fc..92803c4 100644
--- a/cinnamon-desktop/distinfo
+++ b/cinnamon-desktop/distinfo
@@ -1,5 +1,8 @@
$NetBSD: distinfo,v 1.1 2015/02/19 17:04:55 jihbed Exp $
-SHA1 (cinnamon-desktop_2.2.3.orig.tar.gz) = f11da96c06964ffcd3ee2d73b27f4ba144ed2aaa
-RMD160 (cinnamon-desktop_2.2.3.orig.tar.gz) = c7435f0ec31a84476e874748d298b56c8a123ec3
-Size (cinnamon-desktop_2.2.3.orig.tar.gz) = 558366 bytes
+SHA1 (3.0.2.tar.gz) = a79595448e846eae28df5cfc8a98daac0c6239f9
+RMD160 (3.0.2.tar.gz) = e999e426269ac985dcb5b389893186b5b59a17a4
+SHA512 (3.0.2.tar.gz) = 0adcc7bd9f9dace245a7d7528893f729947228e4c454e423cdb1d3ac2ae3c04d010226e340d5d9315cc45a84f96f7b0bb173ee1589169ddcfbfadba59e0787a6
+Size (3.0.2.tar.gz) = 577776 bytes
+SHA1 (patch-files_Makefile.am) = 349724eb13da390de2603bcbe2679171a879ee1c
+SHA1 (patch-libcinnamon-desktop_Makefile.am) = 9739ba04d803e41dd0b9ce0aa21e9cbb9634010b
diff --git a/cinnamon-desktop/options.mk b/cinnamon-desktop/options.mk
new file mode 100644
index 0000000..3661a47
--- /dev/null
+++ b/cinnamon-desktop/options.mk
@@ -0,0 +1,18 @@
+# $NetBSD: options.mk,v 1.1 2015/02/19 21:21:12 jihbed Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.cinnamon-desktop
+PKG_SUPPORTED_OPTIONS= introspection
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+= introspection
+
+.if !empty(PKG_OPTIONS:Mintrospection)
+BUILDLINK_DEPMETHOD.gobject-introspection+= build
+.include "../../devel/gobject-introspection/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-introspection
+PLIST.introspection= yes
+.else
+CONFIGURE_ARGS+= --disable-introspection
+.endif
diff --git a/cinnamon-desktop/patches/patch-files_Makefile.am b/cinnamon-desktop/patches/patch-files_Makefile.am
new file mode 100644
index 0000000..19727ef
--- /dev/null
+++ b/cinnamon-desktop/patches/patch-files_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD$
+
+More portable find usage.
+
+--- files/Makefile.am.orig 2016-05-20 11:00:41.000000000 +0000
++++ files/Makefile.am
+@@ -1,5 +1,5 @@
+ install-data-hook:
+- find -mindepth 1 -maxdepth 1 -type d -exec cp -R {} $(DESTDIR)/ \;
++ find . -mindepth 1 -maxdepth 1 -type d -exec cp -R {} $(DESTDIR)/ \;
+
+ uninstall-hook:
+- find -mindepth 1 -type f -exec rm $(DESTDIR)/{} \;
++ find . -mindepth 1 -type f -exec rm $(DESTDIR)/{} \;
diff --git a/cinnamon-desktop/patches/patch-libcinnamon-desktop_Makefile.am b/cinnamon-desktop/patches/patch-libcinnamon-desktop_Makefile.am
new file mode 100644
index 0000000..5981eb9
--- /dev/null
+++ b/cinnamon-desktop/patches/patch-libcinnamon-desktop_Makefile.am
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Fix build.
+
+--- libcinnamon-desktop/Makefile.am.orig 2016-05-20 11:00:41.000000000 +0000
++++ libcinnamon-desktop/Makefile.am
+@@ -50,8 +50,7 @@ libcinnamon_desktop_la_LIBADD = \
+ $(XLIB_LIBS) \
+ $(LIBM) \
+ $(CINNAMON_DESKTOP_LIBS) \
+- libgsystem.la \
+- -lrt
++ libgsystem.la
+
+ libcinnamon_desktop_la_LDFLAGS = \
+ -version-info $(LT_VERSION) \
Home |
Main Index |
Thread Index |
Old Index