Fix build errors. 32/4332/2 accepted/tizen/20130627.145000 submit/tizen/20130627.153034
authorJunfeng Dong <junfeng.dong@intel.com>
Tue, 25 Jun 2013 06:39:54 +0000 (14:39 +0800)
committerJunfeng Dong <junfeng.dong@intel.com>
Thu, 27 Jun 2013 15:16:30 +0000 (23:16 +0800)
    Fix the build requires on gles.
    secure_getenv Replace __secure_getenv

Change-Id: I477c6824b696d4848f3068a526fd55cfbb7db6db
Signed-off-by: Junfeng Dong <junfeng.dong@intel.com>
clock-common/src/clock_fwk_icu.c
clock-common/src/clock_fwk_util.c
packaging/org.tizen.clock.changes [new file with mode: 0644]
packaging/org.tizen.clock.spec [changed mode: 0644->0755]

index b023732..8f389d3 100644 (file)
@@ -102,7 +102,7 @@ int clk_fwk_icu_get_data(time_t intime, char *dstStr, int dstStr_num, char *loc,
        //
        //date = ucal_getNow();
        tmpdate = (double)1000 *intime;
-       uloc_setDefault((const char *)__secure_getenv("LC_TIME"), &status);
+       uloc_setDefault((const char *)secure_getenv("LC_TIME"), &status);
        locale = loc ? loc : uloc_getDefault();
        CLK_RETVM_IF(!locale, FAILED, "locale NULL");
 
index f82685d..a4b2c23 100644 (file)
@@ -150,7 +150,7 @@ int update_tc(Evas_Object * eo, struct _tc *tc)
 {
        char *fname = NULL;
 
-       fname = __secure_getenv("FONTNAME");
+       fname = secure_getenv("FONTNAME");
        if (fname == NULL) {
                fname = _("FONT_NAME");
        }
diff --git a/packaging/org.tizen.clock.changes b/packaging/org.tizen.clock.changes
new file mode 100644 (file)
index 0000000..3f930c1
--- /dev/null
@@ -0,0 +1,3 @@
+* Thu Jun 27 2013 Junfeng Dong <junfeng.dong@intel.com> accepted/tizen/20130530.164823@72bdf88
+- Fix build errors.
+
old mode 100644 (file)
new mode 100755 (executable)
index f205b67..dd725f1
@@ -1,4 +1,5 @@
-#sbs-git:slp/apps/c/clock clock 0.1.2 f249a81b4bd40dc2ce4fb0efce04cdcb287df65f
+%bcond_with mesa
+
 Name:      org.tizen.clock
 Summary:    background image library
 Version:    0.2.57
@@ -25,7 +26,11 @@ BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xcomposite)
 BuildRequires:  pkgconfig(icu-i18n)
 BuildRequires:  pkgconfig(devman)
-BuildRequires:  pkgconfig(opengl-es-20)
+%if %{with mesa}
+BuildRequires:  pkgconfig(glesv2)
+%else
+BuildRequires: pkgconfig(gles20)
+%endif
 BuildRequires:  pkgconfig(capi-appfw-application)
 BuildRequires:  gettext-tools
 BuildRequires: pkgconfig(feedback)