pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Also remove the package for DeforaOS Keyboard
Module Name: pkgsrc-wip
Committed By: Pierre Pronchery <khorben%defora.org@localhost>
Pushed By: khorben
Date: Sun Jan 12 08:07:05 2020 +0100
Changeset: be689cefe6963937209dcdc7f47e943b4fa0f326
Modified Files:
Makefile
deforaos-desktop/Makefile
Removed Files:
deforaos-keyboard/DESCR
deforaos-keyboard/Makefile
deforaos-keyboard/PLIST
deforaos-keyboard/buildlink3.mk
deforaos-keyboard/distinfo
deforaos-keyboard/patches/patch-src_keyboard.c
deforaos-keyboard/patches/patch-tools_Makefile
Log Message:
Also remove the package for DeforaOS Keyboard
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=be689cefe6963937209dcdc7f47e943b4fa0f326
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 -
deforaos-desktop/Makefile | 1 -
deforaos-keyboard/DESCR | 3 ---
deforaos-keyboard/Makefile | 24 ------------------------
deforaos-keyboard/PLIST | 6 ------
deforaos-keyboard/buildlink3.mk | 14 --------------
deforaos-keyboard/distinfo | 7 -------
deforaos-keyboard/patches/patch-src_keyboard.c | 17 -----------------
deforaos-keyboard/patches/patch-tools_Makefile | 18 ------------------
9 files changed, 91 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 4b0d004ac5..564cad9c0c 100644
--- a/Makefile
+++ b/Makefile
@@ -575,7 +575,6 @@ SUBDIR+= deforaos-camera
SUBDIR+= deforaos-desktop
SUBDIR+= deforaos-framer
SUBDIR+= deforaos-init
-SUBDIR+= deforaos-keyboard
SUBDIR+= deforaos-mailer
SUBDIR+= deforaos-mixer
SUBDIR+= deforaos-pdfviewer
diff --git a/deforaos-desktop/Makefile b/deforaos-desktop/Makefile
index 7a57fcf1cb..a80ff924af 100644
--- a/deforaos-desktop/Makefile
+++ b/deforaos-desktop/Makefile
@@ -16,7 +16,6 @@ META_PACKAGE= yes
DEPENDS+= deforaos-accessories>=0.0.3:../../wip/deforaos-accessories
DEPENDS+= deforaos-camera>=0.0.1:../../wip/deforaos-camera
DEPENDS+= deforaos-framer>=0.0.0:../../wip/deforaos-framer
-DEPENDS+= deforaos-keyboard>=0.2.1:../../wip/deforaos-keyboard
DEPENDS+= deforaos-mailer>=0.1.5:../../wip/deforaos-mailer
DEPENDS+= deforaos-mixer>=0.1.1:../../wip/deforaos-mixer
DEPENDS+= deforaos-pdfviewer>=0.0.1:../../wip/deforaos-pdfviewer
diff --git a/deforaos-keyboard/DESCR b/deforaos-keyboard/DESCR
deleted file mode 100644
index 63c1e1781c..0000000000
--- a/deforaos-keyboard/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-DeforaOS desktop virtual keyboard
-
-This is the GTK3 version.
diff --git a/deforaos-keyboard/Makefile b/deforaos-keyboard/Makefile
deleted file mode 100644
index c3d9e88233..0000000000
--- a/deforaos-keyboard/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2013/11/06 01:28:00 khorben Exp $
-
-DISTNAME= Keyboard-0.2.1
-PKGNAME= deforaos-keyboard-0.2.1
-PKGREVISION= 2
-CATEGORIES= x11
-MASTER_SITES= https://www.defora.org/os/download/download/3696/
-
-MAINTAINER= khorben%defora.org@localhost
-HOMEPAGE= https://www.defora.org/
-COMMENT= DeforaOS desktop virtual keyboard
-LICENSE= gnu-gpl-v3
-
-CONFLICTS+= gnome-control-center>=2.20.1
-
-USE_TOOLS+= pkg-config
-USE_TOOLS+= xgettext
-
-MAKE_FLAGS+= DESTDIR=${DESTDIR}
-MAKE_FLAGS+= PREFIX=${PREFIX}
-
-.include "../../x11/libXtst/buildlink3.mk"
-.include "../../x11/deforaos-libdesktop/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/deforaos-keyboard/PLIST b/deforaos-keyboard/PLIST
deleted file mode 100644
index b4e364281a..0000000000
--- a/deforaos-keyboard/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2012/10/04 23:35:38 khorben Exp $
-bin/keyboard
-bin/keyboardctl
-include/Desktop/Keyboard.h
-share/applications/keyboard.desktop
-share/locale/fr/LC_MESSAGES/Keyboard.mo
diff --git a/deforaos-keyboard/buildlink3.mk b/deforaos-keyboard/buildlink3.mk
deleted file mode 100644
index 34ffe1e8e0..0000000000
--- a/deforaos-keyboard/buildlink3.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2014/06/26 12:06:06 khorben Exp $
-
-BUILDLINK_TREE+= deforaos-keyboard
-
-.if !defined(DEFORAOS_KEYBOARD_BUILDLINK3_MK)
-DEFORAOS_KEYBOARD_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.deforaos-keyboard+= deforaos-keyboard>=0.0.2
-BUILDLINK_PKGSRCDIR.deforaos-keyboard?= ../../wip/deforaos-keyboard
-
-.include "../../x11/gtk3/buildlink3.mk"
-.endif # DEFORAOS_KEYBOARD_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -deforaos-keyboard
diff --git a/deforaos-keyboard/distinfo b/deforaos-keyboard/distinfo
deleted file mode 100644
index d349aae48b..0000000000
--- a/deforaos-keyboard/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.4 2013/11/06 01:28:00 khorben Exp $
-
-SHA1 (Keyboard-0.2.1.tar.gz) = f852d01c172fd7bebb9f73b6709050b7ed8d7526
-RMD160 (Keyboard-0.2.1.tar.gz) = 9f3206cc67b7e68ad81aebb767ca258bbe8853ca
-Size (Keyboard-0.2.1.tar.gz) = 29127 bytes
-SHA1 (patch-src_keyboard.c) = ffc100bea3bd5d6dd643bf19d41567011d988e87
-SHA1 (patch-tools_Makefile) = 48d50a887ed39397d0f893acbaba918698c2df8b
diff --git a/deforaos-keyboard/patches/patch-src_keyboard.c b/deforaos-keyboard/patches/patch-src_keyboard.c
deleted file mode 100644
index d1da43f1d5..0000000000
--- a/deforaos-keyboard/patches/patch-src_keyboard.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_keyboard.c,v 1.1 2013/11/06 01:28:00 khorben Exp $
-
-API change in libDesktop 0.0.10
-
---- src/keyboard.c.orig 2012-09-22 01:07:48.000000000 +0000
-+++ src/keyboard.c
-@@ -437,8 +437,8 @@ Keyboard * keyboard_new(KeyboardPrefs *
- keyboard_set_layout(keyboard, KLS_LETTERS);
- pango_font_description_free(bold);
- /* messages */
-- desktop_message_register(KEYBOARD_CLIENT_MESSAGE, on_keyboard_message,
-- keyboard);
-+ desktop_message_register(keyboard->window, KEYBOARD_CLIENT_MESSAGE,
-+ on_keyboard_message, keyboard);
- return keyboard;
- }
-
diff --git a/deforaos-keyboard/patches/patch-tools_Makefile b/deforaos-keyboard/patches/patch-tools_Makefile
deleted file mode 100644
index 8359fa03eb..0000000000
--- a/deforaos-keyboard/patches/patch-tools_Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-tools_Makefile,v 1.1 2013/11/06 01:28:00 khorben Exp $
-
-Building with Gtk+ 3 by default
-
---- tools/Makefile.orig 2012-10-04 22:24:55.000000000 +0000
-+++ tools/Makefile
-@@ -5,9 +5,9 @@ BINDIR = $(PREFIX)/bin
- CC ?= cc
- CPPFLAGSF?=
- CPPFLAGS?=
--CFLAGSF = -W `pkg-config --cflags gtk+-2.0`
-+CFLAGSF = -W `pkg-config --cflags gtk+-3.0`
- CFLAGS = -Wall -g -O2
--LDFLAGSF= `pkg-config --libs gtk+-2.0`
-+LDFLAGSF= `pkg-config --libs gtk+-3.0`
- RM ?= rm -f
- LN ?= ln -f
- MKDIR ?= mkdir -p
Home |
Main Index |
Thread Index |
Old Index