* [Buildroot] [PATCH] new package: ratpoison
@ 2017-05-12 22:02 Mario J. Rugiero
2017-06-01 8:37 ` Thomas Petazzoni
2017-06-01 14:33 ` [Buildroot] [PATCH v2] " Mario J. Rugiero
0 siblings, 2 replies; 6+ messages in thread
From: Mario J. Rugiero @ 2017-05-12 22:02 UTC (permalink / raw)
To: buildroot
Tested with:
nitrogen6sx_defconfig
Signed-off-by: Mario J. Rugiero <mrugiero@gmail.com>
---
package/Config.in | 1 +
package/ratpoison/Config.in | 22 ++++++++++++++++++++++
package/ratpoison/ratpoison.hash | 2 ++
package/ratpoison/ratpoison.mk | 22 ++++++++++++++++++++++
4 files changed, 47 insertions(+)
create mode 100644 package/ratpoison/Config.in
create mode 100644 package/ratpoison/ratpoison.hash
create mode 100644 package/ratpoison/ratpoison.mk
diff --git a/package/Config.in b/package/Config.in
index 3876ffa93..6ad761bc1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -339,6 +339,7 @@ comment "X window managers"
source "package/matchbox/Config.in"
source "package/metacity/Config.in"
source "package/openbox/Config.in"
+ source "package/ratpoison/Config.in"
endmenu
menu "Hardware handling"
diff --git a/package/ratpoison/Config.in b/package/ratpoison/Config.in
new file mode 100644
index 000000000..c5c5cc774
--- /dev/null
+++ b/package/ratpoison/Config.in
@@ -0,0 +1,22 @@
+config BR2_PACKAGE_RATPOISON
+ bool "ratpoison"
+ depends on BR2_PACKAGE_XORG || BR2_PACKAGE_XORG7
+ depends on BR2_PACKAGE_XLIB_LIBX11
+ select BR2_PACKAGE_LIBERATION
+ select BR2_PACKAGE_FONTCONFIG
+ help
+ Ratpoison is a simple Window Manager. It is largely modelled after
+ GNU Screen and focuses on the keyboard instead of a mouse.
+
+ The screen can be split into non-overlapping frames.
+ All windows are kept maximized inside their frames to take full
+ advantage of your precious screen real estate.
+
+ http://www.nongnu.org/ratpoison/
+
+config BR2_PACKAGE_RATPOISON_RANDR
+ bool "Xrandr support"
+ depends on BR2_PACKAGE_RATPOISON
+ depends on BR2_PACKAGE_XLIB_LIBXRANDR
+ help
+ Build ratpoison with randr support, mainly for multihead.
diff --git a/package/ratpoison/ratpoison.hash b/package/ratpoison/ratpoison.hash
new file mode 100644
index 000000000..0f6e169d4
--- /dev/null
+++ b/package/ratpoison/ratpoison.hash
@@ -0,0 +1,2 @@
+#Locally computed
+sha256 d98fa4be025ecca453c407ff311ab3949f29f20d6d8abedf8f0716b85fc8d1f1 ratpoison-1.4.9.tar.xz
diff --git a/package/ratpoison/ratpoison.mk b/package/ratpoison/ratpoison.mk
new file mode 100644
index 000000000..1545cb17c
--- /dev/null
+++ b/package/ratpoison/ratpoison.mk
@@ -0,0 +1,22 @@
+#############################################################
+#
+# ratpoison
+#
+#############################################################
+
+RATPOISON_VERSION = 1.4.9
+RATPOISON_SOURCE = ratpoison-$(RATPOISON_VERSION).tar.xz
+RATPOISON_SITE = http://download.savannah.nongnu.org/releases/ratpoison
+
+RATPOISON_CONF_OPTS = --x-includes=$(STAGING_DIR)/usr/include/X11 \
+ --x-libraries=$(STAGING_DIR)/usr/lib
+
+RATPOISON_DEPENDENCIES = $(XSERVER) xlib_libX11
+
+ifeq ($(BR2_PACKAGE_RATPOISON_RANDR),y)
+ RATPOISON_DEPENDENCIES += xlib_libXrandr
+else
+ RATPOISON_CONF_OPTS += --without-xrandr
+endif
+
+$(eval $(autotools-package))
--
2.13.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH] new package: ratpoison
2017-05-12 22:02 [Buildroot] [PATCH] new package: ratpoison Mario J. Rugiero
@ 2017-06-01 8:37 ` Thomas Petazzoni
2017-06-01 14:33 ` [Buildroot] [PATCH v2] " Mario J. Rugiero
1 sibling, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2017-06-01 8:37 UTC (permalink / raw)
To: buildroot
Hello,
Thanks for your contribution. However, there's a number of things that
aren't really correct in the patch. See my comments below.
On Fri, 12 May 2017 19:02:46 -0300, Mario J. Rugiero wrote:
> package/Config.in | 1 +
> package/ratpoison/Config.in | 22 ++++++++++++++++++++++
> package/ratpoison/ratpoison.hash | 2 ++
> package/ratpoison/ratpoison.mk | 22 ++++++++++++++++++++++
Missing addition to the DEVELOPERS file.
> +config BR2_PACKAGE_RATPOISON
> + bool "ratpoison"
> + depends on BR2_PACKAGE_XORG || BR2_PACKAGE_XORG7
BR2_PACKAGE_XORG doesn't exist, so this should just be:
depends on BR2_PACKAGE_XORG7
> + depends on BR2_PACKAGE_XLIB_LIBX11
This should be a "select".
> + select BR2_PACKAGE_LIBERATION
> + select BR2_PACKAGE_FONTCONFIG
And please order selects by alphabetic ordering.
> + help
> + Ratpoison is a simple Window Manager. It is largely modelled after
> + GNU Screen and focuses on the keyboard instead of a mouse.
> +
> + The screen can be split into non-overlapping frames.
> + All windows are kept maximized inside their frames to take full
> + advantage of your precious screen real estate.
> +
> + http://www.nongnu.org/ratpoison/
> +
> +config BR2_PACKAGE_RATPOISON_RANDR
> + bool "Xrandr support"
> + depends on BR2_PACKAGE_RATPOISON
> + depends on BR2_PACKAGE_XLIB_LIBXRANDR
> + help
> + Build ratpoison with randr support, mainly for multihead.
No need for a sub-option, just enable xrandr support in the .mk file
when BR2_PACKAGE_XLIB_LIBXRANDR is enabled.
> diff --git a/package/ratpoison/ratpoison.hash b/package/ratpoison/ratpoison.hash
> new file mode 100644
> index 000000000..0f6e169d4
> --- /dev/null
> +++ b/package/ratpoison/ratpoison.hash
> @@ -0,0 +1,2 @@
> +#Locally computed
Space between # and Locally.
> +sha256 d98fa4be025ecca453c407ff311ab3949f29f20d6d8abedf8f0716b85fc8d1f1 ratpoison-1.4.9.tar.xz
> diff --git a/package/ratpoison/ratpoison.mk b/package/ratpoison/ratpoison.mk
> new file mode 100644
> index 000000000..1545cb17c
> --- /dev/null
> +++ b/package/ratpoison/ratpoison.mk
> @@ -0,0 +1,22 @@
> +#############################################################
> +#
> +# ratpoison
> +#
> +#############################################################
Wrong number of #. Please pass your package through
supports/scripts/check-package before submission.
> +RATPOISON_VERSION = 1.4.9
> +RATPOISON_SOURCE = ratpoison-$(RATPOISON_VERSION).tar.xz
> +RATPOISON_SITE = http://download.savannah.nongnu.org/releases/ratpoison
Missing license and license file.
> +
> +RATPOISON_CONF_OPTS = --x-includes=$(STAGING_DIR)/usr/include/X11 \
> + --x-libraries=$(STAGING_DIR)/usr/lib
> +
> +RATPOISON_DEPENDENCIES = $(XSERVER) xlib_libX11
$(XSERVER) doesn't exist.
> +
> +ifeq ($(BR2_PACKAGE_RATPOISON_RANDR),y)
> + RATPOISON_DEPENDENCIES += xlib_libXrandr
> +else
> + RATPOISON_CONF_OPTS += --without-xrandr
> +endif
Please replace with:
ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y)
RATPOISON_DEPENDENCIES += xlib_libXrandr
RATPOISON_CONF_OPTS += --with-xrandr
else
RATPOISON_CONF_OPTS += --without-xrandr
endif
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v2] new package: ratpoison
2017-05-12 22:02 [Buildroot] [PATCH] new package: ratpoison Mario J. Rugiero
2017-06-01 8:37 ` Thomas Petazzoni
@ 2017-06-01 14:33 ` Mario J. Rugiero
2017-06-06 21:01 ` Thomas Petazzoni
1 sibling, 1 reply; 6+ messages in thread
From: Mario J. Rugiero @ 2017-06-01 14:33 UTC (permalink / raw)
To: buildroot
Tested with:
nitrogen6sx_defconfig
Signed-off-by: Mario J. Rugiero <mrugiero@gmail.com>
---
v2: fix inexistent variables, add license and license files, fix style
issues, add myself to DEVELOPERS.
v1: create the package.
DEVELOPERS | 3 +++
package/Config.in | 1 +
package/ratpoison/Config.in | 15 +++++++++++++++
package/ratpoison/ratpoison.hash | 2 ++
package/ratpoison/ratpoison.mk | 25 +++++++++++++++++++++++++
5 files changed, 46 insertions(+)
create mode 100644 package/ratpoison/Config.in
create mode 100644 package/ratpoison/ratpoison.hash
create mode 100644 package/ratpoison/ratpoison.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index 4936b81bd..7a00e6b29 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1046,6 +1046,9 @@ F: package/polkit/
F: package/sg3_utils/
F: package/udisks/
+N: Mario Rugiero <mrugiero@gmail.com>
+F: package/ratpoison/
+
N: Markos Chandras <markos.chandras@imgtec.com>
F: package/harfbuzz/
F: package/libsecret/
diff --git a/package/Config.in b/package/Config.in
index 43d75a9c7..3e7c45dc1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -339,6 +339,7 @@ comment "X window managers"
source "package/matchbox/Config.in"
source "package/metacity/Config.in"
source "package/openbox/Config.in"
+ source "package/ratpoison/Config.in"
endmenu
menu "Hardware handling"
diff --git a/package/ratpoison/Config.in b/package/ratpoison/Config.in
new file mode 100644
index 000000000..e16a2fac7
--- /dev/null
+++ b/package/ratpoison/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_RATPOISON
+ bool "ratpoison"
+ depends on BR2_PACKAGE_XORG7
+ select BR2_PACKAGE_FONTCONFIG
+ select BR2_PACKAGE_LIBERATION
+ select BR2_PACKAGE_XLIB_LIBX11
+ help
+ Ratpoison is a simple Window Manager. It is largely modelled after
+ GNU Screen and focuses on the keyboard instead of a mouse.
+
+ The screen can be split into non-overlapping frames.
+ All windows are kept maximized inside their frames to take full
+ advantage of your precious screen real estate.
+
+ http://www.nongnu.org/ratpoison/
diff --git a/package/ratpoison/ratpoison.hash b/package/ratpoison/ratpoison.hash
new file mode 100644
index 000000000..44781b07a
--- /dev/null
+++ b/package/ratpoison/ratpoison.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 d98fa4be025ecca453c407ff311ab3949f29f20d6d8abedf8f0716b85fc8d1f1 ratpoison-1.4.9.tar.xz
diff --git a/package/ratpoison/ratpoison.mk b/package/ratpoison/ratpoison.mk
new file mode 100644
index 000000000..18222c217
--- /dev/null
+++ b/package/ratpoison/ratpoison.mk
@@ -0,0 +1,25 @@
+################################################################################
+#
+# ratpoison
+#
+################################################################################
+
+RATPOISON_VERSION = 1.4.9
+RATPOISON_SOURCE = ratpoison-$(RATPOISON_VERSION).tar.xz
+RATPOISON_SITE = http://download.savannah.nongnu.org/releases/ratpoison
+RATPOISON_LICENSE = GPL-2.0
+RATPOISON_LICENSE_FILES = COPYING
+
+RATPOISON_CONF_OPTS = --x-includes=$(STAGING_DIR)/usr/include/X11 \
+ --x-libraries=$(STAGING_DIR)/usr/lib
+
+RATPOISON_DEPENDENCIES = xlib_libX11
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y)
+ RATPOISON_DEPENDENCIES += xlib_libXrandr
+ RATPOISON_CONF_OPTS += --with-xrandr
+else
+ RATPOISON_CONF_OPTS += --without-xrandr
+endif
+
+$(eval $(autotools-package))
--
2.13.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH v2] new package: ratpoison
2017-06-01 14:33 ` [Buildroot] [PATCH v2] " Mario J. Rugiero
@ 2017-06-06 21:01 ` Thomas Petazzoni
2017-06-06 23:02 ` Mario Rugiero
0 siblings, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2017-06-06 21:01 UTC (permalink / raw)
To: buildroot
Hello,
I've applied, after doing a number of fixes.
First, the commit title should have been "ratpoison: new package".
On Thu, 1 Jun 2017 11:33:49 -0300, Mario J. Rugiero wrote:
> diff --git a/package/ratpoison/ratpoison.mk b/package/ratpoison/ratpoison.mk
> new file mode 100644
> index 000000000..18222c217
> --- /dev/null
> +++ b/package/ratpoison/ratpoison.mk
> @@ -0,0 +1,25 @@
> +################################################################################
> +#
> +# ratpoison
> +#
> +################################################################################
> +
> +RATPOISON_VERSION = 1.4.9
> +RATPOISON_SOURCE = ratpoison-$(RATPOISON_VERSION).tar.xz
> +RATPOISON_SITE = http://download.savannah.nongnu.org/releases/ratpoison
> +RATPOISON_LICENSE = GPL-2.0
The license really was GPL-2.0+, not GPL-2.0.
> +RATPOISON_LICENSE_FILES = COPYING
> +
> +RATPOISON_CONF_OPTS = --x-includes=$(STAGING_DIR)/usr/include/X11 \
> + --x-libraries=$(STAGING_DIR)/usr/lib
Indentation on the second line should be done with just one tab. And
also, explicitly disabling options not handled is a good practice. So
in the end, this looked like this:
+RATPOISON_CONF_OPTS = \
+ --x-includes=$(STAGING_DIR)/usr/include/X11 \
+ --x-libraries=$(STAGING_DIR)/usr/lib \
+ --without-xkb \
+ --without-xft
If you want to send another patch to optionally enable XKB and XFT
support, that would be welcome.
> +ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y)
> + RATPOISON_DEPENDENCIES += xlib_libXrandr
> + RATPOISON_CONF_OPTS += --with-xrandr
Do not indent such variable definitions.
Applied with those fixes. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v2] new package: ratpoison
2017-06-06 21:01 ` Thomas Petazzoni
@ 2017-06-06 23:02 ` Mario Rugiero
2017-06-07 15:03 ` Thomas Petazzoni
0 siblings, 1 reply; 6+ messages in thread
From: Mario Rugiero @ 2017-06-06 23:02 UTC (permalink / raw)
To: buildroot
2017-06-06 18:01 GMT-03:00 Thomas Petazzoni
<thomas.petazzoni@free-electrons.com>:
> Hello,
Hello.
>
> I've applied, after doing a number of fixes.
>
> First, the commit title should have been "ratpoison: new package".
Noted.
>
> On Thu, 1 Jun 2017 11:33:49 -0300, Mario J. Rugiero wrote:
>> diff --git a/package/ratpoison/ratpoison.mk b/package/ratpoison/ratpoison.mk
>> new file mode 100644
>> index 000000000..18222c217
>> --- /dev/null
>> +++ b/package/ratpoison/ratpoison.mk
>> @@ -0,0 +1,25 @@
>> +################################################################################
>> +#
>> +# ratpoison
>> +#
>> +################################################################################
>> +
>> +RATPOISON_VERSION = 1.4.9
>> +RATPOISON_SOURCE = ratpoison-$(RATPOISON_VERSION).tar.xz
>> +RATPOISON_SITE = http://download.savannah.nongnu.org/releases/ratpoison
>> +RATPOISON_LICENSE = GPL-2.0
>
> The license really was GPL-2.0+, not GPL-2.0.
It didn't seem like it was GPL-2.0+ in the COPYING file, but I may be wrong.
>
>> +RATPOISON_LICENSE_FILES = COPYING
>> +
>> +RATPOISON_CONF_OPTS = --x-includes=$(STAGING_DIR)/usr/include/X11 \
>> + --x-libraries=$(STAGING_DIR)/usr/lib
>
> Indentation on the second line should be done with just one tab. And
> also, explicitly disabling options not handled is a good practice. So
> in the end, this looked like this:
>
> +RATPOISON_CONF_OPTS = \
> + --x-includes=$(STAGING_DIR)/usr/include/X11 \
> + --x-libraries=$(STAGING_DIR)/usr/lib \
> + --without-xkb \
> + --without-xft
Noted.
>
> If you want to send another patch to optionally enable XKB and XFT
> support, that would be welcome.
I'll probably send a new patch during this week.
>
>> +ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y)
>> + RATPOISON_DEPENDENCIES += xlib_libXrandr
>> + RATPOISON_CONF_OPTS += --with-xrandr
>
> Do not indent such variable definitions.
Noted
>
> Applied with those fixes. Thanks!
>
> Thomas
Thanks for the feedback.
Mario.
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux and Kernel engineering
> http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v2] new package: ratpoison
2017-06-06 23:02 ` Mario Rugiero
@ 2017-06-07 15:03 ` Thomas Petazzoni
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2017-06-07 15:03 UTC (permalink / raw)
To: buildroot
Hello,
On Tue, 6 Jun 2017 20:02:11 -0300, Mario Rugiero wrote:
> > The license really was GPL-2.0+, not GPL-2.0.
> It didn't seem like it was GPL-2.0+ in the COPYING file, but I may be wrong.
The COPYING file never specifies if it's "or later" or not. The COPYING
file contains the text of one specific version of the license. It's
then the copyright notice at the beginning of source files that will
say "covered by GPL version 2" or "covered by GPL version 2 or later".
Check the ratpoison source files, they say "or later". Hence the
GPL-2.0+.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-06-07 15:03 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-12 22:02 [Buildroot] [PATCH] new package: ratpoison Mario J. Rugiero
2017-06-01 8:37 ` Thomas Petazzoni
2017-06-01 14:33 ` [Buildroot] [PATCH v2] " Mario J. Rugiero
2017-06-06 21:01 ` Thomas Petazzoni
2017-06-06 23:02 ` Mario Rugiero
2017-06-07 15:03 ` Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.