search

termux / x11-packages

A set of packages using X11 Windows System.
Other
548 stars 145 forks source link

add packages: adwaita-qt and gnome-themes-extra #705

Closed Yisus7u7 closed 2 years ago

Yisus7u7 commented 2 years ago

Screenshot_20220329-195218

Yisus7u7 commented 2 years ago

@xtkoba Done.

xtkoba commented 2 years ago

I wonder why adwaita-qt and gnome-themes-extra are packaged in one commit. I cannot derive any dependency between the two from their build.shs.

Yisus7u7 commented 2 years ago

I wonder why adwaita-qt and gnome-themes-extra are packaged in one commit. I cannot derive any dependency between the two from their build.shs.

1- Both belong to the ADWAITA set of themes

2 - You can add the confirmation as 2 new packages even though they don't have much in common, I do this before.

Yisus7u7 commented 2 years ago

You can merge the changes without problems.

xtkoba commented 2 years ago

I'm afraid I cannot.

Yisus7u7 commented 2 years ago

@xtkoba I remind you that termux does NOT provide the adwaita theme, gnome-themes-extra contains the adwaita theme of both gtk2 and gtk3 (I unified both in a single package).

I remind you that the current theme of gtk3 is libadwaita but it works only in GNOME and cannot be compiled in termux.

Here I provide the adwaita vanilla theme for termux and another theme to match the Qt apps.

Yisus7u7 commented 2 years ago

@Grimler91.

xtkoba commented 2 years ago

I would say other packages that depend on gtk3 may depend on gnome-themes-extra. But gnome-themes-extra itself should never depend on gtk3.

Yisus7u7 commented 2 years ago

I would say other packages that depend on gtk3 may depend on gnome-themes-extra. But gnome-themes-extra itself should never depend on gtk3.

Without gtk3 the Adwaita theme for gtk3 will not be added.

If you want I add gtk3 to TERMUX_PKG_BUILD_DEPENDS.

xtkoba commented 2 years ago

What do you mean by "Adwaita theme for gtk3"? It does not seem to be installed even now.

xtkoba commented 2 years ago

I also suggest splitting share/ directory as a platform-independent subpackage and setting an appropriate dependency for it, if it is intended to be used from GTK+ 3 applications.

Yisus7u7 commented 2 years ago

@xtkoba See: https://pkgs.alpinelinux.org/contents?repo=community&page=70&arch=x86&branch=edge&name=gnome-themes-extra

Yisus7u7 commented 2 years ago

I also suggest splitting share/ directory as a platform-independent subpackage and setting an appropriate dependency for it, if it is intended to be used from GTK+ 3 applications.

https://pkgs.alpinelinux.org/contents?repo=community&page=70&arch=x86&branch=edge&name=gnome-themes-extra

Look at that example.

Alpine only distributes it for gtk3 and does not have the gtk2 support.

gnome-themes-extra can be distributed to the taste of the distribution, you can check packages from other distributions if you want.

Yisus7u7 commented 2 years ago

There is no need to create a subpackage, all those files belong to gnome-themes-extra and the distributions distribute it to liking.

Yisus7u7 commented 2 years ago

@xtkoba You are confused.

gtk3 does not need theme engine. You can research it if you want, gtk3 unlike gtk2 does not need extra engines to read themes.

xtkoba commented 2 years ago

Then would you please split lib/gtk-2.0/2.10.0/engines/libadwaita.so as a subpackage? GTK+ 3 applications never use this file, and depending on gtk2 solely for this file seems overkill to me.

Yisus7u7 commented 2 years ago

Then would you please split lib/gtk-2.0/2.10.0/engines/libadwaita.so as a subpackage? GTK+ 3 applications never use this file, and depending on gtk2 solely for this file seems overkill to me.

I don't know what name to give the subpackage, since the distributions provide this unified package.

xtkoba commented 2 years ago

Maybe gtk2-engines-adwaita or something?

Yisus7u7 commented 2 years ago

@xtkoba Done.

xtkoba commented 2 years ago

I suggest the following change.

For the parent package,

TERMUX_PKG_DEPENDS=""

(or remove the line for TERMUX_PKG_DEPENDS) and set TERMUX_PKG_BUILD_DEPENDS appropriately, and

TERMUX_PLATFORM_INDEPENDENT=true

For the subpackages (plural for the reason stated below),

TERMUX_SUBPKG_PLATFORM_INDEPENDENT=false

The contents of gnome-themes-extra are essentially image files, which do not need gtk{2,3} or glib to "interpret".

I have noticed I missed the files lib/gtk-2.0/2.10.0/engines/libadwaita.{a,la}, which should go to gtk2-engines-adwaita-static subpackage.

Yisus7u7 commented 2 years ago

@xtoba That's OK?

xtkoba commented 2 years ago

Note that TERMUX_SUBPKG_PLATFORM_INDEPENDENT by default inherits TERMUX_PKG_PLATFORM_INDEPENDENT. In our case we need

TERMUX_SUBPKG_PLATFORM_INDEPENDENT=false

in the subpackage because it is not platform independent (consisting of shared objects).

I still see gnome-themes-extra-static generated. I wonder if TERMUX_PKG_NO_STATICSPLIT=true is needed (for the parent package).

Yisus7u7 commented 2 years ago

@xtkoba done.

xtkoba commented 2 years ago

@Yisus7u7 See my comments in https://github.com/termux/x11-packages/pull/705#issuecomment-1082594131. These are not fixed yet.

Yisus7u7 commented 2 years ago

@Yisus7u7 See my comments in #705 (comment). These are not fixed yet.

Why don't we just provide the package just like the other distributions?

Yisus7u7 commented 2 years ago

@xtkoba Done.

xtkoba commented 2 years ago

LGTM. Please squash.

Yisus7u7 commented 2 years ago

@xtkoba Screenshot_20220329-234533

Yisus7u7 commented 2 years ago

@xtkoba Done!

Yisus7u7 commented 2 years ago

I will merge this tomorrow (March 31 in UTC) if I see no objection from other contributors.

Thank you, there are still other open PR, and soon I will open many more