update: e17 0.17.0 release

classic Classic list List threaded Threaded
7 messages Options
Reply | Threaded
Open this post in threaded view
|

update: e17 0.17.0 release

Stefan Sperling-8
This diff updates the e17 ports to the final 0.17.0 release.

There are known issues (e.g. battery module) that I'm not addressing
here. I want to get this upgrade out of the way first.
This doesn't add any new patches but removes those that were rolled
into the release by upstream.

I haven't found a way to upgrade from 0.17.0alpha3 to 0.17.0
without bumping EPOCH. Is this possible somehow?

I've bumped shlib versions to 2.1, but didn't check wether any
existing interfaces have been removed from the shared libs.
Currently, the only user of these libraries is enlightenment itself
so it doesn't really matter all that much anyway...

ok?

Index: e/Makefile
===================================================================
RCS file: /cvs/ports/x11/e17/e/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- e/Makefile 10 Nov 2012 19:57:39 -0000 1.38
+++ e/Makefile 23 Dec 2012 14:12:02 -0000
@@ -2,13 +2,12 @@
 
 COMMENT = the enlightened window manager
 
-VERSION = 0.17.0-alpha
+VERSION = 0.17.0
 DISTNAME = enlightenment-${VERSION}
 PKGNAME = enlightenment-${VERSION:S/-//}
 EXTRACT_SUFX= .tar.bz2
 
-REVISION = 0
-EPOCH = 0
+EPOCH = 1
 
 # BSD
 PERMIT_PACKAGE_CDROM = Yes
@@ -27,7 +26,7 @@ WANTLIB += ecore_ipc ecore_x edbus edje
 WANTLIB += efreet_trash ehal eina eio embryo enotify eukit evas execinfo
 WANTLIB += expat ffi fribidi fontconfig freetype glib-2.0 gobject-2.0
 WANTLIB += gthread-2.0 harfbuzz idn icudata icule icuuc jpeg ${MODLUA_WANTLIB}
-WANTLIB += m pcre pthread pthread-stubs ssl xcb xcb-shape z
+WANTLIB += m pcre pthread pthread-stubs ssl xcb xcb-keysyms xcb-shape z
 
 LIB_DEPENDS = x11/e17/edje>=2.0 \
  x11/e17/efreet>=2.0 \
Index: e/distinfo
===================================================================
RCS file: /cvs/ports/x11/e17/e/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- e/distinfo 10 Nov 2012 15:06:00 -0000 1.5
+++ e/distinfo 23 Dec 2012 13:24:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (e17/enlightenment-0.17.0-alpha.tar.bz2) = AENvjqjpYhxhlR9Uqr6h2fgQSGZijV/fWqbyWfOZtx8=
-SIZE (e17/enlightenment-0.17.0-alpha.tar.bz2) = 15689333
+SHA256 (e17/enlightenment-0.17.0.tar.bz2) = Cx2+sotcEUgWp9KjVnuQ/+brn0mrSTnK15e6WfNeUlo=
+SIZE (e17/enlightenment-0.17.0.tar.bz2) = 29213523
Index: e/patches/patch-configure
===================================================================
RCS file: /cvs/ports/x11/e17/e/patches/patch-configure,v
retrieving revision 1.5
diff -u -p -r1.5 patch-configure
--- e/patches/patch-configure 10 Nov 2012 15:06:03 -0000 1.5
+++ e/patches/patch-configure 23 Dec 2012 13:23:55 -0000
@@ -2,27 +2,9 @@ $OpenBSD: patch-configure,v 1.5 2012/11/
 
 Try to avoid linking against libintl.a, fix version number in paths.
 
---- configure.orig Mon Nov  5 16:30:25 2012
-+++ configure Thu Nov  8 02:29:13 2012
-@@ -13033,7 +13033,7 @@ release_info=""
- ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
- ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-
--release=relname
-+release="$PACKAGE_VERSION"
-
-
-
-@@ -13363,7 +13363,7 @@ fi
-
-
-
--MODULE_ARCH="$host_os-$host_cpu-relname"
-+MODULE_ARCH="$host_os-$host_cpu-${PACKAGE_VERSION}"
-
-
- cat >>confdefs.h <<_ACEOF
-@@ -14613,12 +14613,12 @@ else
+--- configure.orig Fri Nov 16 15:54:06 2012
++++ configure Sun Nov 18 09:41:14 2012
+@@ -14614,12 +14614,12 @@ else
  #include <libintl.h>
  $gt_revision_test_code
  extern int _nl_msg_cat_cntr;
@@ -37,7 +19,7 @@ Try to avoid linking against libintl.a,
    ;
    return 0;
  }
-@@ -15443,7 +15443,7 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
+@@ -15444,7 +15444,7 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
    fi
 
 
Index: e/patches/patch-src_bin_e_start_main_c
===================================================================
RCS file: e/patches/patch-src_bin_e_start_main_c
diff -N e/patches/patch-src_bin_e_start_main_c
--- e/patches/patch-src_bin_e_start_main_c 10 Nov 2012 15:06:03 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,47 +0,0 @@
-$OpenBSD: patch-src_bin_e_start_main_c,v 1.1 2012/11/10 15:06:03 stsp Exp $
-- avoid Linux-specific ptrace(2) usage which doesn't compile
-- instead actually launch enlightenment via execv()
---- src/bin/e_start_main.c.orig Sat Nov  3 22:20:25 2012
-+++ src/bin/e_start_main.c Thu Nov  8 02:55:31 2012
-@@ -18,7 +18,9 @@
-
- #include <Eina.h>
-
-+#ifdef __linux__
- static Eina_Bool tainted = EINA_FALSE;
-+#endif
-
- static void env_set(const char *var, const char *val);
- EAPI int    prefix_determine(char *argv0);
-@@ -226,7 +228,9 @@ main(int argc, char **argv)
-    char valgrind_path[PATH_MAX] = "";
-    const char *valgrind_log = NULL;
-    Eina_Bool really_know = EINA_FALSE;
-+#ifdef __linux__
-    Eina_Bool restart = EINA_TRUE;
-+#endif
-
-    eina_init();
-
-@@ -376,11 +380,12 @@ main(int argc, char **argv)
-    args[i++] = buf;
-    copy_args(args + i, argv + 1, argc - 1);
-    args[i + argc - 1] = NULL;
--   /* execv(args[0], args); */
-+   execv(args[0], args);
-
-    /* not run at the moment !! */
-
-
-+#ifdef __linux__
-    /* Now looping until */
-    while (restart)
-      {
-@@ -497,6 +502,7 @@ main(int argc, char **argv)
-           }
-          
-      }
-+#endif /* __linux__ */
-
-    return -1;
- }
Index: e/patches/patch-src_modules_Makefile_in
===================================================================
RCS file: e/patches/patch-src_modules_Makefile_in
diff -N e/patches/patch-src_modules_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ e/patches/patch-src_modules_Makefile_in 23 Dec 2012 13:23:55 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/modules/Makefile.in.orig Sun Nov 18 09:47:21 2012
++++ src/modules/Makefile.in Sun Nov 18 09:47:32 2012
+@@ -2099,7 +2099,7 @@ EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) @EDJE_DEF@
+ @USE_MODULE_CPUFREQ_TRUE@cpufreq_freqset_SOURCES = cpufreq/freqset.c
+ @USE_MODULE_CPUFREQ_TRUE@cpufreq_freqset_CFLAGS = @e_cflags@ @SUID_CFLAGS@
+ @USE_MODULE_CPUFREQ_TRUE@cpufreq_freqset_LDFLAGS = @SUID_LDFLAGS@
+-@USE_MODULE_CPUFREQ_TRUE@cpufreq_setuid_root_mode = a=rx,u+xs
++@USE_MODULE_CPUFREQ_TRUE@cpufreq_setuid_root_mode = a=rx,u+x
+ @USE_MODULE_CPUFREQ_TRUE@cpufreq_setuid_root_user = root
+ @USE_MODULE_IBOX_TRUE@iboxdir = $(MDIR)/ibox
+ @USE_MODULE_IBOX_TRUE@ibox_DATA = ibox/e-module-ibox.edj \
Index: e/patches/patch-src_modules_battery_e_mod_openbsd_c
===================================================================
RCS file: e/patches/patch-src_modules_battery_e_mod_openbsd_c
diff -N e/patches/patch-src_modules_battery_e_mod_openbsd_c
--- e/patches/patch-src_modules_battery_e_mod_openbsd_c 10 Nov 2012 15:06:03 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,177 +0,0 @@
-$OpenBSD: patch-src_modules_battery_e_mod_openbsd_c,v 1.1 2012/11/10 15:06:03 stsp Exp $
-don't crash on systems which do not have battery or AC status sensors
---- src/modules/battery/e_mod_openbsd.c.orig Fri Nov  9 02:27:23 2012
-+++ src/modules/battery/e_mod_openbsd.c Fri Nov  9 02:33:52 2012
-@@ -15,8 +15,8 @@ extern Eina_List *device_batteries;
- extern Eina_List *device_ac_adapters;
- extern double init_time;
-
--Ac_Adapter *ac;
--Battery *bat;
-+Ac_Adapter *ac = NULL;
-+Battery *bat = NULL;
-
- int
- _battery_openbsd_start(void)
-@@ -106,80 +106,89 @@ _battery_openbsd_battery_update()
-    struct sensor s;
-    size_t slen = sizeof(struct sensor);
-
--   /* update the poller interval */
--   ecore_poller_poller_interval_set(bat->poll,
--                                    battery_config->poll_interval);
--
--   /* last full capacity */
--   bat->mib[3] = 8;
--   bat->mib[4] = 0;
--   if (sysctl(bat->mib, 5, &s, &slen, NULL, 0) != -1)
-+   if (bat)
-      {
--        bat->last_full_charge = (double)s.value;
--     }
-+       /* update the poller interval */
-+       ecore_poller_poller_interval_set(bat->poll,
-+                                        battery_config->poll_interval);
-+    
-+       /* last full capacity */
-+       bat->mib[3] = 8;
-+       bat->mib[4] = 0;
-+       if (sysctl(bat->mib, 5, &s, &slen, NULL, 0) != -1)
-+         {
-+            bat->last_full_charge = (double)s.value;
-+         }
-+    
-+       /* remaining capcity */
-+       bat->mib[3] = 8;
-+       bat->mib[4] = 3;
-+       if (sysctl(bat->mib, 5, &s, &slen, NULL, 0) != -1)
-+         {
-+            charge = (double)s.value;
-+         }
-+    
-+       _time = ecore_time_get();
-+       if ((bat->got_prop) && (charge != bat->current_charge))
-+         bat->charge_rate = ((charge - bat->current_charge) / (_time - bat->last_update));
-+       bat->last_update = _time;
-+       bat->current_charge = charge;
-+       bat->percent = 100 * (bat->current_charge / bat->last_full_charge);
-+       if (bat->got_prop)
-+         {
-+            if (bat->charge_rate > 0)
-+              {
-+                 if (battery_config->fuzzy && (++battery_config->fuzzcount <= 10) && (bat->time_full > 0))
-+                   bat->time_full = (((bat->last_full_charge - bat->current_charge) / bat->charge_rate) + bat->time_full) / 2;
-+                 else
-+                   bat->time_full = (bat->last_full_charge - bat->current_charge) / bat->charge_rate;
-+                 bat->time_left = -1;
-+              }
-+            else
-+              {
-+                 if (battery_config->fuzzy && (battery_config->fuzzcount <= 10) && (bat->time_left > 0))
-+                   bat->time_left = (((0 - bat->current_charge) / bat->charge_rate) + bat->time_left) / 2;
-+                 else
-+                   bat->time_left = (0 - bat->current_charge) / bat->charge_rate;
-+                 bat->time_full = -1;
-+              }
-+         }
-+       else
-+         {
-+            bat->time_full = -1;
-+            bat->time_left = -1;
-+         }
-+    
-+       /* battery state 1: discharge, 2: charge */
-+       bat->mib[3] = 10;
-+       bat->mib[4] = 0;
-+       if (sysctl(bat->mib, 5, &s, &slen, NULL, 0) == -1)
-+         {
-+            if (s.value == 2)
-+              bat->charging = 1;
-+            else
-+              bat->charging = 0;
-+         }
-+   }
-
--   /* remaining capcity */
--   bat->mib[3] = 8;
--   bat->mib[4] = 3;
--   if (sysctl(bat->mib, 5, &s, &slen, NULL, 0) != -1)
-+   if (ac)
-      {
--        charge = (double)s.value;
--     }
-+       /* AC State */
-+       ac->mib[3] = 9;
-+       ac->mib[4] = 0;
-+       if (sysctl(ac->mib, 5, &s, &slen, NULL, 0) == -1)
-+         {
-+            if (s.value)
-+              ac->present = 1;
-+            else
-+              ac->present = 0;
-+         }
-+     }
-
--   _time = ecore_time_get();
--   if ((bat->got_prop) && (charge != bat->current_charge))
--     bat->charge_rate = ((charge - bat->current_charge) / (_time - bat->last_update));
--   bat->last_update = _time;
--   bat->current_charge = charge;
--   bat->percent = 100 * (bat->current_charge / bat->last_full_charge);
--   if (bat->got_prop)
--     {
--        if (bat->charge_rate > 0)
--          {
--             if (battery_config->fuzzy && (++battery_config->fuzzcount <= 10) && (bat->time_full > 0))
--               bat->time_full = (((bat->last_full_charge - bat->current_charge) / bat->charge_rate) + bat->time_full) / 2;
--             else
--               bat->time_full = (bat->last_full_charge - bat->current_charge) / bat->charge_rate;
--             bat->time_left = -1;
--          }
--        else
--          {
--             if (battery_config->fuzzy && (battery_config->fuzzcount <= 10) && (bat->time_left > 0))
--               bat->time_left = (((0 - bat->current_charge) / bat->charge_rate) + bat->time_left) / 2;
--             else
--               bat->time_left = (0 - bat->current_charge) / bat->charge_rate;
--             bat->time_full = -1;
--          }
--     }
--   else
--     {
--        bat->time_full = -1;
--        bat->time_left = -1;
--     }
--
--   /* battery state 1: discharge, 2: charge */
--   bat->mib[3] = 10;
--   bat->mib[4] = 0;
--   if (sysctl(bat->mib, 5, &s, &slen, NULL, 0) == -1)
--     {
--        if (s.value == 2)
--          bat->charging = 1;
--        else
--          bat->charging = 0;
--     }
--
--   /* AC State */
--   ac->mib[3] = 9;
--   ac->mib[4] = 0;
--   if (sysctl(ac->mib, 5, &s, &slen, NULL, 0) == -1)
--     {
--        if (s.value)
--          ac->present = 1;
--        else
--          ac->present = 0;
--     }
--
--   if (bat->got_prop)
--     _battery_device_update();
--   bat->got_prop = 1;
-+  if (bat)
-+    {
-+       if (bat->got_prop)
-+         _battery_device_update();
-+       bat->got_prop = 1;
-+    }
- }
Index: e/patches/patch-src_modules_cpufreq_Makefile_in
===================================================================
RCS file: e/patches/patch-src_modules_cpufreq_Makefile_in
diff -N e/patches/patch-src_modules_cpufreq_Makefile_in
--- e/patches/patch-src_modules_cpufreq_Makefile_in 10 Nov 2012 15:06:03 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_modules_cpufreq_Makefile_in,v 1.3 2012/11/10 15:06:03 stsp Exp $
---- src/modules/cpufreq/Makefile.in.orig Mon Nov  5 16:30:32 2012
-+++ src/modules/cpufreq/Makefile.in Thu Nov  8 00:09:57 2012
-@@ -477,7 +477,7 @@ module_la_SOURCES = e_mod_main.c \
- module_la_LIBADD = @e_libs@ @dlopen_libs@
- module_la_LDFLAGS = -module -avoid-version
- freqsetdir = $(pkgdir)
--setuid_root_mode = a=rx,u+xs
-+setuid_root_mode = a=rx,u+x
- setuid_root_user = root
- freqset_SOURCES = freqset.c
- freqset_CFLAGS = @e_cflags@ @SUID_CFLAGS@
Index: e/patches/patch-src_modules_temperature_tempget_c
===================================================================
RCS file: e/patches/patch-src_modules_temperature_tempget_c
diff -N e/patches/patch-src_modules_temperature_tempget_c
--- e/patches/patch-src_modules_temperature_tempget_c 10 Nov 2012 15:06:03 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_modules_temperature_tempget_c,v 1.4 2012/11/10 15:06:03 stsp Exp $
-support km(4) sensor
---- src/modules/temperature/tempget.c.orig Fri Nov  9 03:22:17 2012
-+++ src/modules/temperature/tempget.c Fri Nov  9 03:22:31 2012
-@@ -128,6 +128,11 @@ init(void)
- sensor_name = strdup("cpu0");
- break;
- }
-+ if (strcmp(snsrdev.xname, "km0") == 0) {
-+ sensor_type = SENSOR_TYPE_OPENBSD;
-+ sensor_name = strdup("km0");
-+ break;
-+ }
- }
- #else
- therms = ecore_file_ls("/proc/acpi/thermal_zone");
Index: e/patches/patch-src_modules_wizard_page_011_c
===================================================================
RCS file: e/patches/patch-src_modules_wizard_page_011_c
diff -N e/patches/patch-src_modules_wizard_page_011_c
--- e/patches/patch-src_modules_wizard_page_011_c 10 Nov 2012 19:57:42 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_modules_wizard_page_011_c,v 1.1 2012/11/10 19:57:42 stsp Exp $
-Fix keyboard layout listing in initial configuration screen.
---- src/modules/wizard/page_011.c.orig Sat Nov  3 22:20:50 2012
-+++ src/modules/wizard/page_011.c Sat Nov 10 18:51:00 2012
-@@ -19,6 +19,11 @@ find_rules(void)
- {
-    int i = 0;
-    const char *lstfiles[] = {
-+#if defined __NetBSD__
-+      "/usr/X11R7/lib/X11/xkb/rules/xorg.lst",
-+#elif defined __OpenBSD__
-+      "/usr/X11R6/share/X11/xkb/rules/base.lst",
-+#endif
-       "/usr/share/X11/xkb/rules/xorg.lst",
-       "/usr/share/X11/xkb/rules/xfree86.lst",
-       "/usr/local/share/X11/xkb/rules/xorg.lst",
Index: e/pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/x11/e17/e/pkg/PFRAG.shared,v
retrieving revision 1.7
diff -u -p -r1.7 PFRAG.shared
--- e/pkg/PFRAG.shared 10 Nov 2012 15:06:03 -0000 1.7
+++ e/pkg/PFRAG.shared 23 Dec 2012 13:37:15 -0000
@@ -72,5 +72,6 @@ lib/enlightenment/modules/wizard/openbsd
 lib/enlightenment/modules/wizard/openbsd${OSREV}-${FULLARCH}-${VERSION}/page_150.so
 lib/enlightenment/modules/wizard/openbsd${OSREV}-${FULLARCH}-${VERSION}/page_160.so
 lib/enlightenment/modules/wizard/openbsd${OSREV}-${FULLARCH}-${VERSION}/page_170.so
+lib/enlightenment/modules/wizard/openbsd${OSREV}-${FULLARCH}-${VERSION}/page_180.so
 lib/enlightenment/modules/wizard/openbsd${OSREV}-${FULLARCH}-${VERSION}/page_200.so
 lib/enlightenment/modules/xkbswitch/openbsd${OSREV}-${FULLARCH}-${VERSION}/module.so
Index: e/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/e17/e/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- e/pkg/PLIST 10 Nov 2012 15:06:03 -0000 1.10
+++ e/pkg/PLIST 23 Dec 2012 13:37:15 -0000
@@ -271,7 +271,6 @@ lib/enlightenment/modules/conf_theme/ope
 lib/enlightenment/modules/conf_theme/openbsd${OSREV}-${FULLARCH}-${VERSION}/module.a
 lib/enlightenment/modules/conf_theme/openbsd${OSREV}-${FULLARCH}-${VERSION}/module.la
 lib/enlightenment/modules/conf_window_manipulation/
-lib/enlightenment/modules/conf_window_manipulation/e-module-conf_winmanip.edj
 lib/enlightenment/modules/conf_window_manipulation/module.desktop
 lib/enlightenment/modules/conf_window_manipulation/openbsd${OSREV}-${FULLARCH}-${VERSION}/
 lib/enlightenment/modules/conf_window_manipulation/openbsd${OSREV}-${FULLARCH}-${VERSION}/module.a
@@ -545,6 +544,8 @@ lib/enlightenment/modules/wizard/openbsd
 lib/enlightenment/modules/wizard/openbsd${OSREV}-${FULLARCH}-${VERSION}/page_160.la
 lib/enlightenment/modules/wizard/openbsd${OSREV}-${FULLARCH}-${VERSION}/page_170.a
 lib/enlightenment/modules/wizard/openbsd${OSREV}-${FULLARCH}-${VERSION}/page_170.la
+lib/enlightenment/modules/wizard/openbsd${OSREV}-${FULLARCH}-${VERSION}/page_180.a
+lib/enlightenment/modules/wizard/openbsd${OSREV}-${FULLARCH}-${VERSION}/page_180.la
 lib/enlightenment/modules/wizard/openbsd${OSREV}-${FULLARCH}-${VERSION}/page_200.a
 lib/enlightenment/modules/wizard/openbsd${OSREV}-${FULLARCH}-${VERSION}/page_200.la
 lib/enlightenment/modules/xkbswitch/
@@ -569,22 +570,42 @@ share/enlightenment/AUTHORS
 share/enlightenment/COPYING
 share/enlightenment/data/
 share/enlightenment/data/backgrounds/
+share/enlightenment/data/backgrounds/Brown_Rock_Hi.edj
+share/enlightenment/data/backgrounds/Colorful_Roses.edj
+share/enlightenment/data/backgrounds/Curly_Leaves.edj
 share/enlightenment/data/backgrounds/Dark_Gradient.edj
 share/enlightenment/data/backgrounds/Darkconcrete.edj
+share/enlightenment/data/backgrounds/Flower_Petals.edj
+share/enlightenment/data/backgrounds/Go_Away.edj
+share/enlightenment/data/backgrounds/Grassy.edj
+share/enlightenment/data/backgrounds/Green_Stem.edj
+share/enlightenment/data/backgrounds/Hills.edj
 share/enlightenment/data/backgrounds/Japanesemaple.edj
 share/enlightenment/data/backgrounds/Lakegrass.edj
+share/enlightenment/data/backgrounds/Lantern_Cluster.edj
+share/enlightenment/data/backgrounds/Leafy_Red.edj
+share/enlightenment/data/backgrounds/Light.edj
 share/enlightenment/data/backgrounds/Light_Gradient.edj
 share/enlightenment/data/backgrounds/Mossstring.edj
 share/enlightenment/data/backgrounds/Motleyrock.edj
 share/enlightenment/data/backgrounds/Newgrowth.edj
+share/enlightenment/data/backgrounds/Orange_Roses.edj
 share/enlightenment/data/backgrounds/Pattern_Radial.edj
 share/enlightenment/data/backgrounds/Pattern_Vertical.edj
 share/enlightenment/data/backgrounds/Pattern_Vertical_Hi.edj
+share/enlightenment/data/backgrounds/Pine_Silhouettes.edj
+share/enlightenment/data/backgrounds/Purple_Flower_Bunch.edj
+share/enlightenment/data/backgrounds/Ramen.edj
+share/enlightenment/data/backgrounds/Shady_Leaves.edj
 share/enlightenment/data/backgrounds/Skywall.edj
 share/enlightenment/data/backgrounds/Stringflower.edj
+share/enlightenment/data/backgrounds/Temple.edj
+share/enlightenment/data/backgrounds/Train.edj
+share/enlightenment/data/backgrounds/Wall_Lanterns.edj
 share/enlightenment/data/backgrounds/Wetgrass.edj
 share/enlightenment/data/backgrounds/Wetleaf.edj
 share/enlightenment/data/backgrounds/Whiterock.edj
+share/enlightenment/data/backgrounds/Windy_Palm.edj
 share/enlightenment/data/config/
 share/enlightenment/data/config/default/
 share/enlightenment/data/config/default/e.cfg
Index: e_dbus/Makefile
===================================================================
RCS file: /cvs/ports/x11/e17/e_dbus/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- e_dbus/Makefile 10 Nov 2012 15:01:12 -0000 1.11
+++ e_dbus/Makefile 23 Dec 2012 13:02:23 -0000
@@ -1,11 +1,11 @@
 # $OpenBSD: Makefile,v 1.11 2012/11/10 15:01:12 stsp Exp $
 
 COMMENT = enlightenment DBus component
-DISTNAME = e_dbus-1.7.1
+DISTNAME = e_dbus-1.7.4
 
 EPOCH = 1
 
-SO_VERSION = 2.0 # 8.1
+SO_VERSION = 2.1 # 8.1
 .for _lib in edbus enotify econnman0_7x ehal eofono ebluez eukit
 SHARED_LIBS += ${_lib} ${SO_VERSION}
 .endfor
Index: e_dbus/distinfo
===================================================================
RCS file: /cvs/ports/x11/e17/e_dbus/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- e_dbus/distinfo 10 Nov 2012 15:01:12 -0000 1.4
+++ e_dbus/distinfo 23 Dec 2012 13:02:44 -0000
@@ -1,2 +1,2 @@
-SHA256 (e17/e_dbus-1.7.1.tar.gz) = xUMDEHPyZ/Y3ytLqpRzRzN6rmPRfKh60OMTEmuv9U7c=
-SIZE (e17/e_dbus-1.7.1.tar.gz) = 551212
+SHA256 (e17/e_dbus-1.7.4.tar.gz) = F6YymZV/gML50TlF2rKyiTPz7aenosD/8X3MbMXcg6Q=
+SIZE (e17/e_dbus-1.7.4.tar.gz) = 579523
Index: ecore/Makefile
===================================================================
RCS file: /cvs/ports/x11/e17/ecore/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- ecore/Makefile 10 Nov 2012 15:01:15 -0000 1.21
+++ ecore/Makefile 23 Dec 2012 12:57:19 -0000
@@ -1,11 +1,11 @@
 # $OpenBSD: Makefile,v 1.21 2012/11/10 15:01:15 stsp Exp $
 
 COMMENT = core event/X abstraction layer
-DISTNAME = ecore-1.7.1
+DISTNAME = ecore-1.7.4
 
 EPOCH = 2
 
-SO_VERSION = 2.0 # 8.1
+SO_VERSION = 2.1 # 8.1
 # NOTE: Must bump minor version if any shlib's are removed from the
 # components dir to avoid pkg_add -r issues.
 .for _lib in ecore ecore_con ecore_evas ecore_file ecore_imf \
Index: ecore/distinfo
===================================================================
RCS file: /cvs/ports/x11/e17/ecore/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- ecore/distinfo 10 Nov 2012 15:01:15 -0000 1.6
+++ ecore/distinfo 23 Dec 2012 12:58:16 -0000
@@ -1,2 +1,2 @@
-SHA256 (e17/ecore-1.7.1.tar.gz) = 9p4TK7lFwrloqhfnrJfysh4BuU6yWvK5bYmZnI1j6mA=
-SIZE (e17/ecore-1.7.1.tar.gz) = 3790752
+SHA256 (e17/ecore-1.7.4.tar.gz) = L8HSAsaIRmsPM+IcO4ksdhCuX4mDVHWh69sixywNkRY=
+SIZE (e17/ecore-1.7.4.tar.gz) = 3832609
Index: edje/Makefile
===================================================================
RCS file: /cvs/ports/x11/e17/edje/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- edje/Makefile 10 Nov 2012 15:01:15 -0000 1.26
+++ edje/Makefile 23 Dec 2012 13:07:58 -0000
@@ -1,11 +1,11 @@
 # $OpenBSD: Makefile,v 1.26 2012/11/10 15:01:15 stsp Exp $
 
 COMMENT = complex graphical design & layout library
-DISTNAME = edje-1.7.1
+DISTNAME = edje-1.7.4
 
 EPOCH = 2
 
-SHARED_LIBS += edje 2.0 # 8.1
+SHARED_LIBS += edje 2.1 # 8.1
 
 # BSD
 PERMIT_PACKAGE_CDROM = Yes
Index: edje/distinfo
===================================================================
RCS file: /cvs/ports/x11/e17/edje/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- edje/distinfo 10 Nov 2012 15:01:15 -0000 1.6
+++ edje/distinfo 23 Dec 2012 13:08:03 -0000
@@ -1,2 +1,2 @@
-SHA256 (e17/edje-1.7.1.tar.gz) = 15S4shRHhsxCw0MCZg0TAhGqDcIj+jmf2rra7jOX1XU=
-SIZE (e17/edje-1.7.1.tar.gz) = 1329063
+SHA256 (e17/edje-1.7.4.tar.gz) = e4H1Er18q/vnh9K/0tbGIsnOFRaE7lcBfBuxYW9dDlE=
+SIZE (e17/edje-1.7.4.tar.gz) = 1351217
Index: edje/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/e17/edje/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- edje/pkg/PLIST 10 Nov 2012 15:01:15 -0000 1.7
+++ edje/pkg/PLIST 23 Dec 2012 13:09:06 -0000
@@ -6,6 +6,7 @@
 @bin bin/edje_inspector
 @bin bin/edje_player
 bin/edje_recc
+@bin bin/edje_watch
 bin/inkscape2edc
 include/edje-1/
 include/edje-1/Edje.h
Index: eet/Makefile
===================================================================
RCS file: /cvs/ports/x11/e17/eet/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- eet/Makefile 10 Nov 2012 15:06:41 -0000 1.19
+++ eet/Makefile 23 Dec 2012 12:48:27 -0000
@@ -1,12 +1,11 @@
 # $OpenBSD: Makefile,v 1.19 2012/11/10 15:06:41 ajacoutot Exp $
 
 COMMENT = library to write an arbitary set of chunks of data to a file
-DISTNAME = eet-1.7.1
-REVISION = 0
+DISTNAME = eet-1.7.4
 
 EPOCH = 2
 
-SHARED_LIBS +=  eet                  2.0      # 8.1
+SHARED_LIBS +=  eet                  2.1      # 8.1
 
 # BSD
 PERMIT_PACKAGE_CDROM = Yes
Index: eet/distinfo
===================================================================
RCS file: /cvs/ports/x11/e17/eet/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- eet/distinfo 10 Nov 2012 15:02:59 -0000 1.6
+++ eet/distinfo 23 Dec 2012 12:48:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (e17/eet-1.7.1.tar.gz) = M5Abmqa4PzwKH/BEx/+7B3PkbBLMPnHtY2GfwfzZwp4=
-SIZE (e17/eet-1.7.1.tar.gz) = 647306
+SHA256 (e17/eet-1.7.4.tar.gz) = YPDNxieAYlboHGhQgLl6EPNIpT+RmDYP8cZ8oFR+2AY=
+SIZE (e17/eet-1.7.4.tar.gz) = 670448
Index: efreet/Makefile
===================================================================
RCS file: /cvs/ports/x11/e17/efreet/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- efreet/Makefile 10 Nov 2012 15:01:15 -0000 1.18
+++ efreet/Makefile 23 Dec 2012 13:04:06 -0000
@@ -1,11 +1,11 @@
 # $OpenBSD: Makefile,v 1.18 2012/11/10 15:01:15 stsp Exp $
 
 COMMENT = implementations of freedesktop.org specifications
-DISTNAME = efreet-1.7.1
+DISTNAME = efreet-1.7.4
 
 EPOCH = 2
 
-SO_VERSION = 2.0 # 8.1
+SO_VERSION = 2.1 # 8.1
 # NOTE: Must bump minor version if any shlib's are removed from the
 # components dir to avoid pkg_add -r issues.
 .for _lib in efreet efreet_mime efreet_trash
Index: efreet/distinfo
===================================================================
RCS file: /cvs/ports/x11/e17/efreet/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- efreet/distinfo 10 Nov 2012 15:01:15 -0000 1.6
+++ efreet/distinfo 23 Dec 2012 13:04:10 -0000
@@ -1,2 +1,2 @@
-SHA256 (e17/efreet-1.7.1.tar.gz) = vAE4SmmxOOaq5mmxe/rz80rGGJ3FsukJkXCYtYLUF0k=
-SIZE (e17/efreet-1.7.1.tar.gz) = 546437
+SHA256 (e17/efreet-1.7.4.tar.gz) = MMdXKU1mLvYYIn+3+wKg9zp4Hw0xvLOTlwtsepMXKeA=
+SIZE (e17/efreet-1.7.4.tar.gz) = 565864
Index: efreet/patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/e17/efreet/patches/patch-src_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_Makefile_in
--- efreet/patches/patch-src_Makefile_in 15 Mar 2011 19:41:00 -0000 1.1
+++ efreet/patches/patch-src_Makefile_in 23 Dec 2012 13:05:41 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-src_Makefile_in,v 1.1 20
 
 tests/main.c uses clearenv(), which has been rejected twice by POSIX.
 
---- src/Makefile.in.orig Tue Mar  8 16:55:47 2011
-+++ src/Makefile.in Tue Mar  8 16:55:58 2011
-@@ -238,7 +238,7 @@ top_build_prefix = @top_build_prefix@
+--- src/Makefile.in.orig Fri Dec 21 15:42:57 2012
++++ src/Makefile.in Sun Dec 23 14:04:11 2012
+@@ -264,7 +264,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  version_info = @version_info@
Index: efreet/patches/patch-src_bin_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/e17/efreet/patches/patch-src_bin_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_bin_Makefile_in
--- efreet/patches/patch-src_bin_Makefile_in 15 Mar 2011 19:41:00 -0000 1.2
+++ efreet/patches/patch-src_bin_Makefile_in 23 Dec 2012 13:05:41 -0000
@@ -1,18 +1,18 @@
 $OpenBSD: patch-src_bin_Makefile_in,v 1.2 2011/03/15 19:41:00 jasper Exp $
---- src/bin/Makefile.in.orig Tue Mar  8 16:52:20 2011
-+++ src/bin/Makefile.in Tue Mar  8 16:53:22 2011
-@@ -95,7 +95,7 @@ am__v_at_0 = @
+--- src/bin/Makefile.in.orig Fri Dec 21 15:42:57 2012
++++ src/bin/Makefile.in Sun Dec 23 14:05:33 2012
+@@ -94,7 +94,7 @@ am__v_at_0 = @
  CCLD = $(CC)
  LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
  $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 - $(AM_LDFLAGS) $(LDFLAGS) -o $@
 + $(AM_LDFLAGS) $(LDFLAGS) -leet -lecore -o $@
- AM_V_CCLD = $(am__v_CCLD_$(V))
- am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
  am__v_CCLD_0 = @echo "  CCLD  " $@;
-@@ -354,7 +354,7 @@ efreet_desktop_cache_create$(EXEEXT): $(efreet_desktop
+@@ -374,7 +374,7 @@ efreet_desktop_cache_create$(EXEEXT): $(efreet_desktop
  $(AM_V_CCLD)$(LINK) $(efreet_desktop_cache_create_OBJECTS) $(efreet_desktop_cache_create_LDADD) $(LIBS)
- efreet_icon_cache_create$(EXEEXT): $(efreet_icon_cache_create_OBJECTS) $(efreet_icon_cache_create_DEPENDENCIES)
+ efreet_icon_cache_create$(EXEEXT): $(efreet_icon_cache_create_OBJECTS) $(efreet_icon_cache_create_DEPENDENCIES) $(EXTRA_efreet_icon_cache_create_DEPENDENCIES)
  @rm -f efreet_icon_cache_create$(EXEEXT)
 - $(AM_V_CCLD)$(LINK) $(efreet_icon_cache_create_OBJECTS) $(efreet_icon_cache_create_LDADD) $(LIBS)
 + $(AM_V_CCLD)$(LINK) $(efreet_icon_cache_create_OBJECTS) $(efreet_icon_cache_create_LDADD) -L$(top_builddir)/src/lib/.libs/ -lefreet $(LIBS)
Index: eina/Makefile
===================================================================
RCS file: /cvs/ports/x11/e17/eina/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- eina/Makefile 17 Nov 2012 23:26:39 -0000 1.9
+++ eina/Makefile 23 Dec 2012 12:41:30 -0000
@@ -1,12 +1,11 @@
 # $OpenBSD: Makefile,v 1.9 2012/11/17 23:26:39 brad Exp $
 
 COMMENT = EFL API for data types
-VERSION = 1.7.1
+VERSION = 1.7.4
 DISTNAME = eina-${VERSION}
-REVISION= 0
 EPOCH= 1
 
-SHARED_LIBS +=  eina                 2.0      # 8.1
+SHARED_LIBS +=  eina                 2.1      # 8.1
 
 # LGPL v2.1
 PERMIT_PACKAGE_CDROM = Yes
@@ -24,7 +23,7 @@ CONFIGURE_ARGS = --disable-doc \
  --enable-mempool-chained-pool=static \
  --disable-mempool-ememoa-fixed \
  --disable-mempool-ememoa-unknown \
- --enable-mempool-fixed-bitmap \
+ --enable-mempool-fixed-bitmap=static \
  --enable-mempool-pass-through=static \
  --disable-mempool-buddy \
  --enable-mempool-one-big=static
Index: eina/distinfo
===================================================================
RCS file: /cvs/ports/x11/e17/eina/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- eina/distinfo 10 Nov 2012 15:01:15 -0000 1.4
+++ eina/distinfo 23 Dec 2012 12:38:01 -0000
@@ -1,2 +1,2 @@
-SHA256 (e17/eina-1.7.1.tar.gz) = LbqpJvdY19Lo/52e//vwrOtSJbF/0rRkzg/ieYMAmPg=
-SIZE (e17/eina-1.7.1.tar.gz) = 9892896
+SHA256 (e17/eina-1.7.4.tar.gz) = uv9gPWFNoLUtUFVE8YxnDn39cA4MHfXqVihLo9c3x+4=
+SIZE (e17/eina-1.7.4.tar.gz) = 9915971
Index: eio/Makefile
===================================================================
RCS file: /cvs/ports/x11/e17/eio/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- eio/Makefile 10 Nov 2012 14:57:13 -0000 1.2
+++ eio/Makefile 23 Dec 2012 13:00:42 -0000
@@ -2,10 +2,10 @@
 
 COMMENT = async i/o library
 
-DISTNAME = eio-1.7.1
+DISTNAME = eio-1.7.4
 REVISION = 0
 
-SHARED_LIBS += eio 0.0 # 8.1
+SHARED_LIBS += eio 0.1 # 8.1
 
 # LGPL v2.1
 PERMIT_PACKAGE_CDROM = Yes
Index: eio/distinfo
===================================================================
RCS file: /cvs/ports/x11/e17/eio/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- eio/distinfo 10 Nov 2012 14:54:24 -0000 1.1.1.1
+++ eio/distinfo 23 Dec 2012 13:00:45 -0000
@@ -1,2 +1,2 @@
-SHA256 (e17/eio-1.7.1.tar.gz) = TpURtza4CwSVrgpUyWOGFe5TNvV6mHT0+xbxHAuPVj8=
-SIZE (e17/eio-1.7.1.tar.gz) = 420742
+SHA256 (e17/eio-1.7.4.tar.gz) = XRIz2L8qudlVqwaCuPocFf5ZBaVDggwyVaFtHEnsM8E=
+SIZE (e17/eio-1.7.4.tar.gz) = 443826
Index: embryo/Makefile
===================================================================
RCS file: /cvs/ports/x11/e17/embryo/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- embryo/Makefile 10 Nov 2012 15:06:41 -0000 1.12
+++ embryo/Makefile 23 Dec 2012 13:01:38 -0000
@@ -2,8 +2,7 @@
 
 COMMENT = C like scripting language used in E17
 
-DISTNAME = embryo-1.7.1
-REVISION = 0
+DISTNAME = embryo-1.7.4
 
 EPOCH = 2
 
Index: embryo/distinfo
===================================================================
RCS file: /cvs/ports/x11/e17/embryo/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- embryo/distinfo 10 Nov 2012 15:01:15 -0000 1.6
+++ embryo/distinfo 23 Dec 2012 13:01:41 -0000
@@ -1,2 +1,2 @@
-SHA256 (e17/embryo-1.7.1.tar.gz) = 4OljiMagoqNq4aOLbjb1wn960xD7ITvZx5W5hnj5mmk=
-SIZE (e17/embryo-1.7.1.tar.gz) = 524238
+SHA256 (e17/embryo-1.7.4.tar.gz) = MA/pdQoq/+vGs/lDVtvHGdAaNAVLLH/IGknz44p8qXU=
+SIZE (e17/embryo-1.7.4.tar.gz) = 547872
Index: evas/Makefile
===================================================================
RCS file: /cvs/ports/x11/e17/evas/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- evas/Makefile 10 Nov 2012 15:01:15 -0000 1.22
+++ evas/Makefile 23 Dec 2012 12:51:41 -0000
@@ -1,11 +1,11 @@
 # $OpenBSD: Makefile,v 1.22 2012/11/10 15:01:15 stsp Exp $
 
 COMMENT = canvas API for X
-VERSION = 1.7.1
+VERSION = 1.7.4
 DISTNAME = evas-${VERSION}
 EPOCH = 2
 
-SHARED_LIBS +=  evas                 2.0      # 8.1
+SHARED_LIBS +=  evas                 2.1      # 8.1
 
 # BSD
 PERMIT_PACKAGE_CDROM = Yes
Index: evas/distinfo
===================================================================
RCS file: /cvs/ports/x11/e17/evas/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- evas/distinfo 10 Nov 2012 15:01:15 -0000 1.6
+++ evas/distinfo 23 Dec 2012 12:52:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (e17/evas-1.7.1.tar.gz) = u4KY2fAQFyx7TmD54H4/j85z2czkn9WwUjLkBSPJYG8=
-SIZE (e17/evas-1.7.1.tar.gz) = 10142455
+SHA256 (e17/evas-1.7.4.tar.gz) = o+GaC7rTz6/DFMRrqgtSUDgoCbwE5Fi9DAK1zmiinaY=
+SIZE (e17/evas-1.7.4.tar.gz) = 10140871

Reply | Threaded
Open this post in threaded view
|

Re: update: e17 0.17.0 release

Landry Breuil-6
On Sun, Dec 23, 2012 at 03:18:00PM +0100, Stefan Sperling wrote:
> This diff updates the e17 ports to the final 0.17.0 release.
>
> There are known issues (e.g. battery module) that I'm not addressing
> here. I want to get this upgrade out of the way first.
> This doesn't add any new patches but removes those that were rolled
> into the release by upstream.
>
> I haven't found a way to upgrade from 0.17.0alpha3 to 0.17.0
> without bumping EPOCH. Is this possible somehow?

It would have been possible if it had been rc/pre/beta... see
packages-specs(7) - unfortunately 'alpha' is not supported :) a feature
request for espie@ ?

> I've bumped shlib versions to 2.1, but didn't check wether any
> existing interfaces have been removed from the shared libs.
> Currently, the only user of these libraries is enlightenment itself
> so it doesn't really matter all that much anyway...

Ah, sloppy lazyness.. if you want to bump without checking, bump the
major at least. Your call on that.
Fwiw i use a 'dumpsyms' alias to check for api changes, but it's not
100% accurate.

dumpsyms='for i in `make print-plist | perl -n -e "print if s/\@lib //"`
; do nm -g /usr/local/$i | perl -n -e "print if s/^.{9}T //" > `make
show=PKGNAME`-`basename $i` ; done'

Use it in each port, before and after the update, then diff the output
for each version; You'll see if symbols appeared/changed/disappeared.
That doesnt check the function args types nor the #define, but it's a
first step.

> ok?

ok for me.

Landry

Reply | Threaded
Open this post in threaded view
|

Re: update: e17 0.17.0 release

David Coppa
In reply to this post by Stefan Sperling-8
On Sun, Dec 23, 2012 at 3:18 PM, Stefan Sperling <[hidden email]> wrote:
> This diff updates the e17 ports to the final 0.17.0 release.
>
> There are known issues (e.g. battery module) that I'm not addressing
> here. I want to get this upgrade out of the way first.

What's the problem with the battery module?

Reply | Threaded
Open this post in threaded view
|

Re: update: e17 0.17.0 release

Stefan Sperling-8
On Sun, Dec 23, 2012 at 10:23:55PM +0100, David Coppa wrote:
> On Sun, Dec 23, 2012 at 3:18 PM, Stefan Sperling <[hidden email]> wrote:
> > This diff updates the e17 ports to the final 0.17.0 release.
> >
> > There are known issues (e.g. battery module) that I'm not addressing
> > here. I want to get this upgrade out of the way first.
>
> What's the problem with the battery module?

Maxime Villard reported it to me privately instead of the list.
I'm quoting him below (I hope he doesn't mind), instead of paraphrasing
him, so that those who are interested in the problem are in the loop.

On the surface it looks like the code should be using named constants
instead of hard-coded numbers.

--- snip ---

Hi,
do you sill use e17? If so, is the battery module working on you?
On my laptop, I get garbage values because the MIB passed to sysctl()
is 8 instead of 7. It works with this patch but I would like to know
if you get the same error as me and if this patch fixes the bug.

>From svn - src/modules/battery -, but it should not be different in
the release or somewhere else:

Index: e_mod_openbsd.c
===================================================================
--- e_mod_openbsd.c (révision 81641)
+++ e_mod_openbsd.c (copie de travail)
@@ -112,7 +112,7 @@
                                         battery_config->poll_interval);
     
        /* last full capacity */
-       bat->mib[3] = 8;
+       bat->mib[3] = 7;
        bat->mib[4] = 0;
        if (sysctl(bat->mib, 5, &s, &slen, NULL, 0) != -1)
          {
@@ -120,7 +120,7 @@
          }
     
        /* remaining capcity */
-       bat->mib[3] = 8;
+       bat->mib[3] = 7;
        bat->mib[4] = 3;
        if (sysctl(bat->mib, 5, &s, &slen, NULL, 0) != -1)
          {


Thanks in advance,
Maxime

Reply | Threaded
Open this post in threaded view
|

Re: update: e17 0.17.0 release

Amit Kulkarni-5
In reply to this post by Landry Breuil-6
> Ah, sloppy lazyness.. if you want to bump without checking, bump the
> major at least. Your call on that.
> Fwiw i use a 'dumpsyms' alias to check for api changes, but it's not
> 100% accurate.
>
> dumpsyms='for i in `make print-plist | perl -n -e "print if s/\@lib //"`
> ; do nm -g /usr/local/$i | perl -n -e "print if s/^.{9}T //" > `make
> show=PKGNAME`-`basename $i` ; done'
>
> Use it in each port, before and after the update, then diff the output
> for each version; You'll see if symbols appeared/changed/disappeared.
> That doesnt check the function args types nor the #define, but it's a
> first step.
>

Vadim has imported devel/abi-compliance-checker here to do much the same thing:

https://github.com/jasperla/openbsd-wip/blob/master/devel/abi-compliance-checker/Makefile

Reply | Threaded
Open this post in threaded view
|

Re: update: e17 0.17.0 release

Landry Breuil-6
In reply to this post by Stefan Sperling-8
On Sun, Dec 23, 2012 at 10:41:17PM +0100, Stefan Sperling wrote:

> On Sun, Dec 23, 2012 at 10:23:55PM +0100, David Coppa wrote:
> > On Sun, Dec 23, 2012 at 3:18 PM, Stefan Sperling <[hidden email]> wrote:
> > > This diff updates the e17 ports to the final 0.17.0 release.
> > >
> > > There are known issues (e.g. battery module) that I'm not addressing
> > > here. I want to get this upgrade out of the way first.
> >
> > What's the problem with the battery module?
>
> Maxime Villard reported it to me privately instead of the list.
> I'm quoting him below (I hope he doesn't mind), instead of paraphrasing
> him, so that those who are interested in the problem are in the loop.
>
> On the surface it looks like the code should be using named constants
> instead of hard-coded numbers.

Ugh, gross. If you want to implement it properly you can take example on
what i did in upower here :
http://cgit.freedesktop.org/upower/tree/src/openbsd/up-backend.c#n353

mib[3] is a sensor_type, 7 is WATTHOUR, 8 is AMPHOUR. The thing here is
you got to detect first the unit used by the battery/hw to check if you
got to multiply the value by bst_volt.
I think i took the loop from src/sbin/sysctl..

Landry

Reply | Threaded
Open this post in threaded view
|

Re: update: e17 0.17.0 release

TimH
In reply to this post by Stefan Sperling-8
On Sun, 23 Dec 2012 15:18:00 +0100
Stefan Sperling <[hidden email]> wrote:

> This diff updates the e17 ports to the final 0.17.0 release.
>
> There are known issues (e.g. battery module) that I'm not addressing
> here. I want to get this upgrade out of the way first.
> This doesn't add any new patches but removes those that were rolled
> into the release by upstream.
>
> I haven't found a way to upgrade from 0.17.0alpha3 to 0.17.0
> without bumping EPOCH. Is this possible somehow?
>
> I've bumped shlib versions to 2.1, but didn't check wether any
> existing interfaces have been removed from the shared libs.
> Currently, the only user of these libraries is enlightenment itself
> so it doesn't really matter all that much anyway...
>
> ok?
>
> [...] (snipped diff away)

        This compiles and runs for me with a few oddities...

        When I first ran it, it went through its configuration and then
I was left with an empty root window (the Enlightenment color) and the
e17 mouse cursor in a "lit up" state, but nothing else.  So I killed X,
which leaves me with my laptop's screen doing some strange strobe
effect with what looks like it's trying to be text along the top (had
this problem with the previous alpha also, but not with OpenBox).  So I
rebooted and started X again and I got the desktop I expected.  I
really wish I knew why this was; I have to reboot to get it to normal
if I close e17.  The Xorg log file doesn't show anything but a
successful shutdown.  Intel GM45 video.

        I also tested the battery module, which seems to work.  I've
never used it before, so if it isn't acting right I don't notice.

--TimH