Hello community, here is the log from the commit of package enlightenment for openSUSE:Factory checked in at 2020-01-21 20:59:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/enlightenment (Old) and /work/SRC/openSUSE:Factory/.enlightenment.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "enlightenment" Tue Jan 21 20:59:34 2020 rev:30 rq:766082 version:0.23.1 Changes: -------- --- /work/SRC/openSUSE:Factory/enlightenment/enlightenment.changes 2018-10-11 11:50:05.738432285 +0200 +++ /work/SRC/openSUSE:Factory/.enlightenment.new.26092/enlightenment.changes 2020-01-21 20:59:53.188835561 +0100 @@ -1,0 +2,28 @@ +Thu Dec 19 15:34:37 UTC 2019 - Dominique Leuenberger <[email protected]> + +- BuildRequire pkgconfig(libsystemd) instead of systemd-devel: + Allow OBS to shortcut through the -mini flavors. + +------------------------------------------------------------------- +Thu Sep 5 00:41:55 UTC 2019 - simon <[email protected]> + +- 0.23.1 + * Renable wayland support + * Highlights + * New padded screenshot option + * Meson build now is the build system + *Music Control now supports rage mpris dbus protocol + * Add Bluez5 support with totally new and redone module and gadget + * Add dpms option to turn it off or on + * Alt-tab window switcher allows moving of windows while alt-tabbing + * Lots of bug fixes, compile warning fixes etc. + * Massive improvements to Wayland support + +------------------------------------------------------------------- +Wed May 29 13:46:12 UTC 2019 - Simon Lees <[email protected]> + +- Disable wayland until 0.23.0 when it will build again +- only use update alternatives on openSUSE +- enable systemd on Mageia + +------------------------------------------------------------------- Old: ---- enlightenment-0.22.4.tar.xz New: ---- enlightenment-0.23.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ enlightenment.spec ++++++ --- /var/tmp/diff_new_pack.pcOxHm/_old 2020-01-21 20:59:55.736836748 +0100 +++ /var/tmp/diff_new_pack.pcOxHm/_new 2020-01-21 20:59:55.740836750 +0100 @@ -1,7 +1,7 @@ # # spec file for package enlightenment # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,11 +17,14 @@ %define efl_version 1.18.0 -%define systemd_present (0%{?suse_version} >= 1230 || 0%{?fedora} >= 18) -%define enable_wayland (0%{?suse_version} > 1320) +%define systemd_present (0%{?suse_version} >= 1230 || 0%{?fedora} >= 18 || 0%{?mageia}) +# Wayland is broken with current efl waiting for a new e release +%define enable_wayland (0%{?suse_version} > 1520) %define generate_manpages 0 +# Fix this later +%define build_doc 0 Name: enlightenment -Version: 0.22.4 +Version: 0.23.1 Release: 0 Summary: The window manager License: BSD-2-Clause @@ -43,12 +46,10 @@ Patch4: feature-wizard-keylayout-from-sys.patch Patch5: feature-qt-apps-gtk2-theme.patch BuildRequires: alsa-devel -BuildRequires: autoconf -BuildRequires: automake BuildRequires: doxygen BuildRequires: edje >= %{efl_version} BuildRequires: gettext-devel -BuildRequires: libtool +BuildRequires: meson BuildRequires: pam-devel BuildRequires: pkgconfig # configure scripts looks for Xwayland binary @@ -98,9 +99,10 @@ # older e17.3 users will update but anyone who manually installs e17.6 will stay Obsoletes: e17 Provides: e17 > 0.17.4 +%if 0%{?suse_version} Requires(post): update-alternatives Requires(postun): update-alternatives -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%endif %{?systemd_requires} %if %{enable_wayland} BuildRequires: pkgconfig(ecore-wl2) @@ -111,7 +113,7 @@ BuildRequires: pkgconfig(wayland-server) %endif %if %{systemd_present} -BuildRequires: systemd-devel +BuildRequires: pkgconfig(libsystemd) %endif %if 0%{?suse_version} BuildRequires: fdupes @@ -177,6 +179,7 @@ %description branding-upstream Various files for Enlightenment provided by upstream but altered by openSUSE or Petite Linux. +%if %{build_doc} %package doc-html Summary: HTML documentation of Enlightenment Group: Documentation/HTML @@ -184,6 +187,7 @@ %description doc-html Documentation of Enlightenment in form of HTML pages. +%endif %if %{generate_manpages} %package doc-man @@ -214,42 +218,40 @@ FAKE_DOCDATETIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%a %%b %%d %%Y %{T}') sed -i "s/\$datetime/$FAKE_DOCDATETIME/g;s/\$date/$FAKE_DOCDATE/g;s/\$year/$FAKEDOCYEAR/g" doc/*.html -%configure \ +export CFLAGS="%{optflags}%{?mageia: -g}" +%meson \ %if %{enable_wayland} - --enable-wayland \ - --enable-wayland-egl \ - --enable-xwayland \ - --enable-wl-desktop-shell \ - --enable-wl-x11 \ - --enable-wl-fb \ - --enable-wl-drm \ - --enable-wl-text-input \ - --disable-wl-weekeyboard \ -%endif - --disable-static \ - --disable-silent-rules -make %{?_smp_mflags} -make %{?_smp_mflags} doc + -Dwl=true \ + -Dwl-x11=true \ + -Dxwayland=true +%else + -Dwayland=false +%endif + +%meson_build %install -make %{?_smp_mflags} DESTDIR=%{buildroot} install +%meson_install %if %{enable_wayland} %if 0%{?suse_version} >= 1550 # gdm doesn't show 2 desktop files with the same name -rm %{buildroot}%{_datadir}/wayland-sessions/enlightenment.desktop +#rm %{buildroot}%{_datadir}/wayland-sessions/enlightenment.desktop +mkdir -p %{buildroot}%{_datadir}/wayland-sessions/ cp %{buildroot}%{_datadir}/xsessions/enlightenment.desktop \ %{buildroot}%{_datadir}/wayland-sessions/enlightenment-wayland.desktop +%endif %else # for now don't ship a desktop file for Leap - wayland is not stably tested rm %{buildroot}%{_datadir}/wayland-sessions/enlightenment.desktop %endif -%endif +%if %{build_doc} # copy documentation manually echo "Copying HTML documentation" mkdir -p %{buildroot}%{_docdir}/%{name} /bin/cp -vr doc/html %{buildroot}%{_docdir}/%{name} +%endif %if %{generate_manpages} echo "Copying MAN pages" @@ -299,6 +301,7 @@ touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop +%if 0%{?suse_version} %post %{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \ default-xsession.desktop %{_datadir}/xsessions/enlightenment.desktop 20 @@ -307,11 +310,14 @@ if [ ! -f %{_datadir}/xsessions/enlightenment.desktop ] ; then %{_sbindir}/update-alternatives --remove default-xsession.desktop %{_datadir}/xsessions/enlightenment.desktop fi +%endif %files -f enlightenment.lang %defattr(-,root,root) -%doc COPYING README AUTHORS +%license COPYING README AUTHORS +%if %{build_doc} %exclude %{_docdir}/%{name}/html +%endif %{_datadir}/xsessions/enlightenment.desktop %{_datadir}/xsessions/default.desktop %if %{enable_wayland} && 0%{?suse_version} >= 1550 @@ -347,17 +353,10 @@ %{_libdir}/pkgconfig/*.pc %{_includedir}/enlightenment +%if %{build_doc} %files doc-html %defattr(-, root, root) %{_docdir}/%{name} -%if 0%{?centos_version} || 0%{?fedora_version} == 16 -%exclude %{_docdir}/%{name}-%{version}/COPYING -%exclude %{_docdir}/%{name}-%{version}/README -%exclude %{_docdir}/%{name}-%{version}/AUTHORS -%else -%exclude %{_docdir}/%{name}/COPYING -%exclude %{_docdir}/%{name}/README -%exclude %{_docdir}/%{name}/AUTHORS %endif %if %{generate_manpages} ++++++ dont_offer_updates.patch ++++++ --- /var/tmp/diff_new_pack.pcOxHm/_old 2020-01-21 20:59:55.760836760 +0100 +++ /var/tmp/diff_new_pack.pcOxHm/_new 2020-01-21 20:59:55.760836760 +0100 @@ -1,20 +1,20 @@ -Index: enlightenment-0.21.0-alpha/src/modules/wizard/page_170.c +Index: enlightenment-0.23.0/src/modules/wizard/page_170.c =================================================================== ---- enlightenment-0.21.0-alpha.orig/src/modules/wizard/page_170.c -+++ enlightenment-0.21.0-alpha/src/modules/wizard/page_170.c -@@ -1,7 +1,7 @@ - /* Ask about updates checking */ +--- enlightenment-0.23.0.orig/src/modules/wizard/page_170.c ++++ enlightenment-0.23.0/src/modules/wizard/page_170.c +@@ -2,7 +2,7 @@ #include "e_wizard.h" + #include "e_wizard_api.h" -static Eina_Bool do_up = 1; +static Eina_Bool do_up = 0; /* E_API int wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) -@@ -63,7 +63,7 @@ wizard_page_show(E_Wizard_Page *pg EINA_ +@@ -64,7 +64,7 @@ wizard_page_show(E_Wizard_Page *pg EINA_ evas_object_show(of); - e_wizard_page_show(of); + api->wizard_page_show(of); - return 1; /* 1 == show ui, and wait for user, 0 == just continue */ + return 0; /* 1 == show ui, and wait for user, 0 == just continue */ } ++++++ enlightenment-0.22.4.tar.xz -> enlightenment-0.23.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/enlightenment/enlightenment-0.22.4.tar.xz /work/SRC/openSUSE:Factory/.enlightenment.new.26092/enlightenment-0.23.1.tar.xz differ: char 25, line 1 ++++++ feature-wizard-auto-lang.patch ++++++ --- /var/tmp/diff_new_pack.pcOxHm/_old 2020-01-21 20:59:55.796836776 +0100 +++ /var/tmp/diff_new_pack.pcOxHm/_new 2020-01-21 20:59:55.796836776 +0100 @@ -10,11 +10,20 @@ selected as there default just set the language without showing the wizard page. -diff --git a/src/modules/wizard/page_010.c b/src/modules/wizard/page_010.c -index 120953be1..337215bca 100644 ---- a/src/modules/wizard/page_010.c -+++ b/src/modules/wizard/page_010.c -@@ -171,17 +171,11 @@ _lang_content_get(E_Intl_Pair *pair, Evas_Object *obj, const char *part) +Index: enlightenment-0.23.0/src/modules/wizard/page_010.c +=================================================================== +--- enlightenment-0.23.0.orig/src/modules/wizard/page_010.c ++++ enlightenment-0.23.0/src/modules/wizard/page_010.c +@@ -162,7 +162,7 @@ _lang_content_get(E_Intl_Pair *pair, Eva + e_prefix_data_snprintf(buf, sizeof(buf), "data/flags/%s", pair->locale_icon); + else + e_prefix_data_snprintf(buf, sizeof(buf), "data/flags/%s", "lang-system.png"); +- ++ + ic = elm_icon_add(obj); + elm_image_file_set(ic, buf, NULL); + evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 20, 10); +@@ -172,17 +172,11 @@ _lang_content_get(E_Intl_Pair *pair, Eva static char * _lang_text_get(E_Intl_Pair *pair, Evas_Object *obj EINA_UNUSED, const char *part) { @@ -33,7 +42,7 @@ } static void -@@ -210,6 +204,24 @@ wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) +@@ -211,6 +205,24 @@ wizard_page_show(E_Wizard_Page *pg EINA_ .version = ELM_GENLIST_ITEM_CLASS_VERSION }; @@ -53,8 +62,13 @@ + } + i++; + } -+ } ++ } + - e_wizard_title_set(_("Language")); + api->wizard_title_set(_("Language")); of = elm_frame_add(e_comp->elm); elm_object_text_set(of, _("Select one")); +@@ -267,4 +279,3 @@ wizard_page_apply(E_Wizard_Page *pg EINA + api->wizard_labels_update(); + return 1; + } +- ++++++ feature-wizard-keylayout-from-sys.patch ++++++ --- /var/tmp/diff_new_pack.pcOxHm/_old 2020-01-21 20:59:55.800836778 +0100 +++ /var/tmp/diff_new_pack.pcOxHm/_new 2020-01-21 20:59:55.804836780 +0100 @@ -4,18 +4,11 @@ feature-wizard-keylayout-from-sys -diff --git a/src/modules/wizard/page_011.c b/src/modules/wizard/page_011.c -index 2acaf5d..56c1b97 100644 ---- a/src/modules/wizard/page_011.c -+++ b/src/modules/wizard/page_011.c -@@ -1,5 +1,6 @@ - /* Language chooser */ - #include "e_wizard.h" -+#include <eina_log.h> - - typedef struct _Layout Layout; - -@@ -10,8 +11,9 @@ struct _Layout +Index: enlightenment-0.23.0/src/modules/wizard/page_011.c +=================================================================== +--- enlightenment-0.23.0.orig/src/modules/wizard/page_011.c ++++ enlightenment-0.23.0/src/modules/wizard/page_011.c +@@ -11,8 +11,9 @@ struct _Layout }; static const char *rules_file = NULL; @@ -26,7 +19,7 @@ static void find_rules(void) -@@ -111,7 +113,7 @@ implement_layout(void) +@@ -112,7 +113,7 @@ implement_layout(void) if (!found) { nl = E_NEW(E_Config_XKB_Layout, 1); @@ -35,7 +28,7 @@ nl->variant = eina_stringshare_add("basic"); nl->model = eina_stringshare_add("default"); e_config->xkb.used_layouts = eina_list_prepend(e_config->xkb.used_layouts, nl); -@@ -168,6 +170,15 @@ _layout_select(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_U +@@ -169,6 +170,15 @@ _layout_select(void *data, Evas_Object * E_API int wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) { @@ -51,7 +44,7 @@ Evas_Object *of, *ob; Eina_List *l; Layout *lay; -@@ -183,6 +194,49 @@ wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) +@@ -184,6 +194,50 @@ wizard_page_show(E_Wizard_Page *pg EINA_ .version = ELM_GENLIST_ITEM_CLASS_VERSION }; @@ -84,7 +77,7 @@ + layout = lay->name; + } + /* T4934 - Commenting out the 3 lines below should set the keyboard -+ layout from the system without showing the screen, this fails ++ layout from the system without showing the screen, this fails + however its possible to pre select what is probably the right layout */ + /* implement_layout(); + set = EINA_TRUE; @@ -98,10 +91,11 @@ + layout_tmp[1] = 's'; + layout_tmp[2] = 0; + } - e_wizard_title_set(_("Keyboard")); ++ + api->wizard_title_set(_("Keyboard")); of = elm_frame_add(e_comp->elm); elm_object_text_set(of, _("Select one")); -@@ -195,9 +249,9 @@ wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) +@@ -196,9 +250,9 @@ wizard_page_show(E_Wizard_Page *pg EINA_ EINA_LIST_FOREACH(layouts, l, lay) { void *it; @@ -113,7 +107,7 @@ sel_it = it; } -@@ -218,7 +272,10 @@ E_API int +@@ -219,7 +273,10 @@ E_API int wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { /* special - key layout inits its stuff the moment it goes away */ @@ -125,7 +119,7 @@ return 1; } -@@ -226,7 +283,10 @@ E_API int +@@ -227,7 +284,9 @@ E_API int wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { // do this again as we want it to apply to the new profile @@ -137,4 +131,4 @@ + } + return 1; } - +-
