Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gnome mousetweaks4 #16255

Open
wants to merge 1 commit into
base: oi/hipster
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 65 additions & 0 deletions components/gnome/mousetweaks/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
#
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
# Common Development and Distribution License (the "License").
# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
# If applicable, add the following below this CDDL HEADER, with the
# fields enclosed by brackets "[]" replaced with your own identifying
# information: Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#

#
# Copyright (c) 2015, 2021, Oracle and/or its affiliates.
#

BUILD_BITS = 64
include ../../../make-rules/shared-macros.mk

COMPONENT_NAME= mousetweaks
Toasterson marked this conversation as resolved.
Show resolved Hide resolved
COMPONENT_VERSION= 3.32.0
COMPONENT_PROJECT_URL= https://wiki.gnome.org/Projects/Mousetweaks
COMPONENT_ARCHIVE_HASH= \
sha256:0ebd5cdef01547787cbc3697ae758c57db1eec10eab613704d4a17b27685ae00
COMPONENT_BUGDB= gnome/accessibility
COMPONENT_ANITYA_ID= 13153
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_BAID= 64951

TEST_TARGET = $(NO_TESTS)

include $(WS_MAKE_RULES)/common.mk
include $(WS_MAKE_RULES)/gnome-component.mk

# Assumes GNU xgettext in PATH
CONFIGURE_ENV += PATH=$(GNUBIN):$(PATH)

REQUIRED_PACKAGES += gnome/config/gsettings-desktop-schemas
REQUIRED_PACKAGES += library/desktop/cairo
REQUIRED_PACKAGES += library/desktop/gtk3
REQUIRED_PACKAGES += library/desktop/pango
REQUIRED_PACKAGES += library/glib2
REQUIRED_PACKAGES += x11/library/libx11
REQUIRED_PACKAGES += x11/library/libxcursor
REQUIRED_PACKAGES += x11/library/libxfixes
REQUIRED_PACKAGES += x11/library/libxtst
# Auto-generated dependencies
REQUIRED_PACKAGES += library/desktop/cairo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not think it is good idea to bring this from solaris-userland. We already diverged too much and many things makes no sense here when copied verbatim or are even counterproductive.

This is fairly simple component so package it from scratch should be straightforward. And you would also get much smaller Makefile. For example here are duplicate dependencies. Above is COMPONENT_BAID, etc.

REQUIRED_PACKAGES += library/desktop/gtk3
REQUIRED_PACKAGES += library/desktop/pango
REQUIRED_PACKAGES += library/glib2
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += x11/library/libx11
REQUIRED_PACKAGES += x11/library/libxcursor
REQUIRED_PACKAGES += x11/library/libxfixes
REQUIRED_PACKAGES += x11/library/libxtst
111 changes: 111 additions & 0 deletions components/gnome/mousetweaks/manifests/sample-manifest.p5m
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
#
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"), version 1.0.
# You may only use this file in accordance with the terms of version
# 1.0 of the CDDL.
#
# A full copy of the text of the CDDL should have accompanied this
# source. A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.
#

#
# Copyright 2024 <contributor>
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)

license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

file path=usr/bin/mousetweaks
file path=usr/share/GConf/gsettings/mousetweaks.convert
file path=usr/share/glib-2.0/schemas/org.gnome.mousetweaks.enums.xml
file path=usr/share/glib-2.0/schemas/org.gnome.mousetweaks.gschema.xml
file path=usr/share/locale/an/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/ar/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/as/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/ast/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/be/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/bg/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/bn/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/bn_IN/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/bs/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/ca/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/ca@valencia/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/cs/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/da/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/de/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/el/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/en@shaw/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/en_GB/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/eo/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/es/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/et/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/eu/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/fa/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/fi/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/fr/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/fur/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/gd/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/gl/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/gu/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/he/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/hi/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/hr/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/ht/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/hu/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/id/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/is/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/it/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/ja/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/kk/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/kn/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/ko/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/lo/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/lt/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/lv/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/mai/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/mk/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/ml/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/mr/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/nb/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/ne/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/nl/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/nn/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/oc/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/or/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/pa/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/pl/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/pt/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/pt_BR/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/ro/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/ru/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/sk/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/sl/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/sq/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/sr/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/sr@latin/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/sv/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/ta/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/te/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/tg/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/th/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/tr/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/ug/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/uk/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/vi/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/zh_CN/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/zh_HK/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/zh_TW/LC_MESSAGES/mousetweaks.mo
file path=usr/share/man/man1/mousetweaks.1
file path=usr/share/mousetweaks/double-click.png
file path=usr/share/mousetweaks/drag-click.png
file path=usr/share/mousetweaks/mousetweaks.ui
file path=usr/share/mousetweaks/right-click.png
file path=usr/share/mousetweaks/single-click.png
123 changes: 123 additions & 0 deletions components/gnome/mousetweaks/mousetweaks.p5m
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
#
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
# Common Development and Distribution License (the "License").
# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
# If applicable, add the following below this CDDL HEADER, with the
# fields enclosed by brackets "[]" replaced with your own identifying
# information: Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#
# Copyright (c) 2015, 2021, Oracle and/or its affiliates.
#

<transform file path=usr.*/man/.+ -> \
default mangler.man.stability "pass-through volatile">
set name=pkg.fmri \
value=pkg:/gnome/accessibility/mousetweaks@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Mouse accessibility utility for the GNOME Desktop"
set name=com.oracle.info.baid value=$(COMPONENT_BAID)
set name=com.oracle.info.description value=$(COMPONENT_NAME)
set name=info.classification \
value=org.opensolaris.category.2008:Applications/Accessories
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2016/480
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
file path=usr/bin/mousetweaks
file path=usr/share/GConf/gsettings/mousetweaks.convert
file path=usr/share/glib-2.0/schemas/org.gnome.mousetweaks.enums.xml
file path=usr/share/glib-2.0/schemas/org.gnome.mousetweaks.gschema.xml
file path=usr/share/locale/an/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/ar/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/as/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/ast/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/be/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/bg/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/bn/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/bn_IN/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/bs/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/ca/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/ca@valencia/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/cs/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/da/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/de/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/el/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/en@shaw/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/en_GB/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/eo/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/es/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/et/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/eu/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/fa/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/fi/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/fr/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/fur/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/gd/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/gl/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/gu/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/he/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/hi/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/hr/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/ht/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/hu/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/id/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/is/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/it/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/ja/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/kk/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/kn/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/ko/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/lo/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/lt/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/lv/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/mai/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/mk/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/ml/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/mr/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/nb/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/ne/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/nl/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/nn/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/oc/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/or/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/pa/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/pl/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/pt/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/pt_BR/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/ro/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/ru/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/sk/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/sl/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/sq/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/sr/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/sr@latin/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/sv/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/ta/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/te/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/tg/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/th/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/tr/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/ug/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/uk/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/vi/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/zh_CN/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/zh_HK/LC_MESSAGES/mousetweaks.mo
file path=usr/share/locale/zh_TW/LC_MESSAGES/mousetweaks.mo
file path=usr/share/man/man1/mousetweaks.1
file path=usr/share/mousetweaks/double-click.png
file path=usr/share/mousetweaks/drag-click.png
file path=usr/share/mousetweaks/mousetweaks.ui
file path=usr/share/mousetweaks/right-click.png
file path=usr/share/mousetweaks/single-click.png
license COPYING license=GPLv3
18 changes: 18 additions & 0 deletions components/gnome/mousetweaks/pkg5
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"dependencies": [
"gnome/config/gsettings-desktop-schemas",
"library/desktop/cairo",
"library/desktop/gtk3",
"library/desktop/pango",
"library/glib2",
"system/library",
"x11/library/libx11",
"x11/library/libxcursor",
"x11/library/libxfixes",
"x11/library/libxtst"
],
"fmris": [
"gnome/accessibility/mousetweaks"
],
"name": "mousetweaks"
}
60 changes: 60 additions & 0 deletions make-rules/gnome-component.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
#
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
# Common Development and Distribution License (the "License").
# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
# If applicable, add the following below this CDDL HEADER, with the
# fields enclosed by brackets "[]" replaced with your own identifying
# information: Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#

#
# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
#

#
# This file sets up the standard, default options and base requirements for
# GNOME userland components.
#
COMPONENT_PROJECT_URL ?= https://www.gnome.org/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We already have gnome.mk. No need to introduce something similar.

COMPONENT_MAJOR_MINOR ?= $(basename $(COMPONENT_VERSION))
COMPONENT_ARCHIVE ?= $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_URL ?= https://download.gnome.org/sources/$(COMPONENT_NAME)/$(COMPONENT_MAJOR_MINOR)/$(COMPONENT_ARCHIVE)

PKGMOGRIFY_TRANSFORMS += $(WS_TOP)/transforms/gnome-incorporation

include $(WS_MAKE_RULES)/common.mk

ifeq ($(strip $(BUILD_STYLE)),configure)
#CONFIGURE_OPTIONS += --libexecdir="$(USRLIB)"
CONFIGURE_OPTIONS += --localstatedir="$(VARDIR)"

# Tell autoconf's AC_PATH_X that X includes & libraries are in default paths,
# instead of letting it check Imake, which reports the 64-bit library paths,
# causing mismatched RUNPATH entries to be included in 32-bit libraries.
#CONFIGURE_OPTIONS += --x-includes=""
#CONFIGURE_OPTIONS += --x-libraries=""

# Some components require an architecture-specific directory for their
# configuration, so these are specified per-bits.
ETCDIR.32 ?= $(ETCDIR)
ETCDIR.64 ?= $(ETCDIR)
CONFIGURE_OPTIONS += --sysconfdir="$(ETCDIR.$(BITS))"

# configure generally requires GNU make explicitly.
CONFIGURE_ENV += MAKE=$(MAKE)

CONFIGURE_ENV += INTLTOOL_PERL="$(PERL)"
endif # BUILD_STYLE == configure