r22927 - in /packages/unstable/gmime2.4: ChangeLog README build/vs2008/gmime.vcproj configure configure.in gmime.spec zentimer.h
meebey at users.alioth.debian.org
meebey at users.alioth.debian.org
Sat Jan 30 18:24:17 UTC 2010
Author: meebey
Date: Sat Jan 30 18:24:16 2010
New Revision: 22927
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22927
Log:
Merge commit 'upstream/2.4.14'
Modified:
packages/unstable/gmime2.4/ChangeLog
packages/unstable/gmime2.4/README
packages/unstable/gmime2.4/build/vs2008/gmime.vcproj
packages/unstable/gmime2.4/configure
packages/unstable/gmime2.4/configure.in
packages/unstable/gmime2.4/gmime.spec
packages/unstable/gmime2.4/zentimer.h
Modified: packages/unstable/gmime2.4/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/ChangeLog?rev=22927&op=diff
==============================================================================
--- packages/unstable/gmime2.4/ChangeLog [utf-8] (original)
+++ packages/unstable/gmime2.4/ChangeLog [utf-8] Sat Jan 30 18:24:16 2010
@@ -1,3 +1,12 @@
+2010-01-30 Jeffrey Stedfast <fejj at novell.com>
+
+ * README: Bumped version
+
+ * configure.in: Bumped version to 2.4.14 and disabled
+ strict-aliasing which causes bugs in GMime.
+
+ * build/vs2008/gmime.vcproj: Bumped version.
+
2010-01-19 Jeffrey Stedfast <fejj at novell.com>
* README: Bumped version
Modified: packages/unstable/gmime2.4/README
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/README?rev=22927&op=diff
==============================================================================
--- packages/unstable/gmime2.4/README [utf-8] (original)
+++ packages/unstable/gmime2.4/README [utf-8] Sat Jan 30 18:24:16 2010
@@ -1,4 +1,4 @@
- GMime, version 2.4.13
+ GMime, version 2.4.14
by Jeffrey Stedfast <fejj at gnome.org>
Modified: packages/unstable/gmime2.4/build/vs2008/gmime.vcproj
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/build/vs2008/gmime.vcproj?rev=22927&op=diff
==============================================================================
--- packages/unstable/gmime2.4/build/vs2008/gmime.vcproj [utf-8] (original)
+++ packages/unstable/gmime2.4/build/vs2008/gmime.vcproj [utf-8] Sat Jan 30 18:24:16 2010
@@ -41,7 +41,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/D "GMIME_MAJOR_VERSION"="2" /D "GMIME_MINOR_VERSION"="4" /D "GMIME_MICRO_VERSION"="13""
+ AdditionalOptions="/D "GMIME_MAJOR_VERSION"="2" /D "GMIME_MINOR_VERSION"="4" /D "GMIME_MICRO_VERSION"="14""
Optimization="0"
AdditionalIncludeDirectories=""..\..\"; "..\..\util""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GMIME_EXPORTS;HAVE_CONFIG_H;G_DISABLE_DEPRECATED;G_LOG_DOMAIN=\"GMime\""
@@ -106,7 +106,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/D "GMIME_MAJOR_VERSION"="2" /D "GMIME_MINOR_VERSION"="4" /D "GMIME_MICRO_VERSION"="13""
+ AdditionalOptions="/D "GMIME_MAJOR_VERSION"="2" /D "GMIME_MINOR_VERSION"="4" /D "GMIME_MICRO_VERSION"="14""
AdditionalIncludeDirectories=""..\..\"; "..\..\util""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GMIME_EXPORTS;HAVE_CONFIG_H;G_DISABLE_DEPRECATED;G_LOG_DOMAIN=\"GMime\""
RuntimeLibrary="2"
Modified: packages/unstable/gmime2.4/configure
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/configure?rev=22927&op=diff
==============================================================================
--- packages/unstable/gmime2.4/configure [utf-8] (original)
+++ packages/unstable/gmime2.4/configure [utf-8] Sat Jan 30 18:24:16 2010
@@ -2107,7 +2107,7 @@
GMIME_MAJOR_VERSION=2
GMIME_MINOR_VERSION=4
-GMIME_MICRO_VERSION=13
+GMIME_MICRO_VERSION=14
GMIME_VERSION=$GMIME_MAJOR_VERSION.$GMIME_MINOR_VERSION.$GMIME_MICRO_VERSION
GMIME_VERSION_INFO=`expr $GMIME_MAJOR_VERSION + $GMIME_MINOR_VERSION`:$GMIME_MICRO_VERSION:$GMIME_MINOR_VERSION
@@ -20978,6 +20978,7 @@
EXTRA_LIBS="$EXTRA_LIBS $LIBICONV"
fi
+CFLAGS="$CFLAGS -fno-strict-aliasing"
LIBS="$LIBS $EXTRA_LIBS"
Modified: packages/unstable/gmime2.4/configure.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/configure.in?rev=22927&op=diff
==============================================================================
--- packages/unstable/gmime2.4/configure.in [utf-8] (original)
+++ packages/unstable/gmime2.4/configure.in [utf-8] Sat Jan 30 18:24:16 2010
@@ -12,7 +12,7 @@
GMIME_MAJOR_VERSION=2
GMIME_MINOR_VERSION=4
-GMIME_MICRO_VERSION=13
+GMIME_MICRO_VERSION=14
GMIME_VERSION=$GMIME_MAJOR_VERSION.$GMIME_MINOR_VERSION.$GMIME_MICRO_VERSION
GMIME_VERSION_INFO=`expr $GMIME_MAJOR_VERSION + $GMIME_MINOR_VERSION`:$GMIME_MICRO_VERSION:$GMIME_MINOR_VERSION
@@ -490,6 +490,7 @@
EXTRA_LIBS="$EXTRA_LIBS $LIBICONV"
fi
+CFLAGS="$CFLAGS -fno-strict-aliasing"
AC_SUBST(CFLAGS)
LIBS="$LIBS $EXTRA_LIBS"
Modified: packages/unstable/gmime2.4/gmime.spec
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime.spec?rev=22927&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime.spec [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime.spec [utf-8] Sat Jan 30 18:24:16 2010
@@ -1,5 +1,5 @@
# Note that this is NOT a relocatable package
-%define ver 2.4.13
+%define ver 2.4.14
%define prefix /usr
%define enable_mono 0
%define enable_gtk_doc 0
Modified: packages/unstable/gmime2.4/zentimer.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/zentimer.h?rev=22927&op=diff
==============================================================================
--- packages/unstable/gmime2.4/zentimer.h [utf-8] (original)
+++ packages/unstable/gmime2.4/zentimer.h [utf-8] Sat Jan 30 18:24:16 2010
@@ -1,31 +1,40 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* ZenTimer
- * Copyright (C) 2001-2009 Jeffrey Stedfast
+ * Copyright (C) 2009 Jeffrey Stedfast
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
*/
-#ifndef __ZENTINER_H__
+#ifndef __ZENTIMER_H__
#define __ZENTIMER_H__
#ifdef ENABLE_ZENTIMER
#include <stdio.h>
+#ifdef WIN32
+#include <windows.h>
+#else
#include <sys/time.h>
+#endif
#ifdef HAVE_STDINT_H
#include <stdint.h>
#elif HAVE_INTTYPES_H
@@ -46,14 +55,22 @@
/* ztime_t represents usec */
typedef uint64_t ztime_t;
+#ifdef WIN32
+static uint64_t ztimer_freq = 0;
+#endif
+
static void
ztime (ztime_t *ztimep)
{
+#ifdef WIN32
+ QueryPerformanceCounter ((LARGE_INTEGER *) ztimep);
+#else
struct timeval tv;
gettimeofday (&tv, NULL);
*ztimep = ((uint64_t) tv.tv_sec * ZTIME_USEC_PER_SEC) + tv.tv_usec;
+#endif
}
enum {
@@ -62,15 +79,13 @@
ZTIMER_PAUSED = (1 << 1),
};
-typedef uint32_t zstate_t;
-
typedef struct {
- zstate_t state; /* 32bit for alignment reasons */
ztime_t start;
ztime_t stop;
+ int state;
} ztimer_t;
-#define ZTIMER_INITIALIZER { ZTIMER_INACTIVE, 0, 0 }
+#define ZTIMER_INITIALIZER { 0, 0, 0 }
/* default timer */
static ztimer_t __ztimer = ZTIMER_INITIALIZER;
@@ -121,28 +136,39 @@
ztimer->start += delta;
}
+static double
+ZenTimerElapsed (ztimer_t *ztimer, uint64_t *usec)
+{
+#ifdef WIN32
+ static uint64_t freq = 0;
+ ztime_t delta, stop;
+
+ if (freq == 0)
+ QueryPerformanceFrequency ((LARGE_INTEGER *) &freq);
+#else
+ static uint64_t freq = ZTIME_USEC_PER_SEC;
+ ztime_t delta, stop;
+#endif
+
+ ztimer = ztimer ? ztimer : &__ztimer;
+
+ if (ztimer->state != ZTIMER_ACTIVE)
+ stop = ztimer->stop;
+ else
+ ztime (&stop);
+
+ delta = stop - ztimer->start;
+
+ if (usec != NULL)
+ *usec = (uint64_t) (delta * ((double) ZTIME_USEC_PER_SEC / (double) freq));
+
+ return (double) delta / (double) freq;
+}
+
static void
ZenTimerReport (ztimer_t *ztimer, const char *oper)
{
- ztime_t delta;
- int paused;
-
- ztimer = ztimer ? ztimer : &__ztimer;
-
- if (ztimer->state == ZTIMER_ACTIVE) {
- ZenTimerPause (ztimer);
- paused = 1;
- } else {
- paused = 0;
- }
-
- delta = ztimer->stop - ztimer->start;
-
- fprintf (stderr, "ZenTimer: %s took %.6f seconds\n", oper,
- (double) delta / (double) ZTIME_USEC_PER_SEC);
-
- if (paused)
- ZenTimerResume (ztimer);
+ fprintf (stderr, "ZenTimer: %s took %.6f seconds\n", oper, ZenTimerElapsed (ztimer, NULL));
}
#ifdef __cplusplus
@@ -155,6 +181,7 @@
#define ZenTimerStop(ztimerp)
#define ZenTimerPause(ztimerp)
#define ZenTimerResume(ztimerp)
+#define ZenTimerElapsed(ztimerp, usec)
#define ZenTimerReport(ztimerp, oper)
#endif /* ENABLE_ZENTIMER */
More information about the pkg-gnome-commits
mailing list