[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:44:41 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=c272f08
The following commit has been merged in the master branch:
commit c272f08572c754485d8c2d2938229b1d111139b8
Author: Robin Mills <robin at clanmills.com>
Date: Fri Jan 2 08:02:04 2015 +0000
r1014. Thank you, Thomas, for reporting this an providing the fix.
---
src/getopt_win32.h | 84 ---------------------
src/i18n.h | 54 --------------
src/private.h | 210 -----------------------------------------------------
src/timegm.h | 94 ------------------------
src/tzfile.h | 193 ------------------------------------------------
5 files changed, 635 deletions(-)
diff --git a/src/getopt_win32.h b/src/getopt_win32.h
deleted file mode 100644
index 6b6f643..0000000
--- a/src/getopt_win32.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 1987, 1993, 1994, 1996
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef __GETOPT_H__
-#define __GETOPT_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int opterr; /* if error message should be printed */
-extern int optind; /* index into parent argv vector */
-extern int optopt; /* character checked for validity */
-extern int optreset; /* reset getopt */
-extern char *optarg; /* argument associated with option */
-
-int getopt (int, char * const *, const char *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __GETOPT_H__ */
-
-#ifndef __UNISTD_GETOPT__
-#ifndef __GETOPT_LONG_H__
-#define __GETOPT_LONG_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct option {
- const char *name;
- int has_arg;
- int *flag;
- int val;
-};
-
-int getopt_long (int, char *const *, const char *, const struct option *, int *);
-#ifndef HAVE_DECL_GETOPT
-#define HAVE_DECL_GETOPT 1
-#endif
-
-#define no_argument 0
-#define required_argument 1
-#define optional_argument 2
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __GETOPT_LONG_H__ */
-#endif /* __UNISTD_GETOPT__ */
diff --git a/src/i18n.h b/src/i18n.h
deleted file mode 100644
index 23683f3..0000000
--- a/src/i18n.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* **************************************************************** -*- C -*- */
-/*
- * Copyright (C) 2004-2013 Andreas Huggel <ahuggel at gmx.net>
- *
- * This program is part of the Exiv2 distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
- */
-/*
- File: i18n.h
- Brief: i18n definitions. Do not use. This is an Exiv2 internal header.
- Version: $Rev$
- Author(s): Gilles Caulier (gc) <caulier.gilles at kdemail.net>
- History: 01-Nov-06, gc: created
- */
-#ifndef I18N_H_
-#define I18N_H_
-
-#ifdef _MSC_VER
-# include "exv_msvc.h"
-#else
-# include "exv_conf.h"
-#endif
-
-/* NLS can be disabled through the configure --disable-nls option. */
-#ifdef EXV_ENABLE_NLS
-# include <libintl.h>
-
-// Definition is in types.cpp
-EXIV2API const char* _exvGettext(const char* str);
-
-# define _(String) _exvGettext(String)
-# define N_(String) String
-
-#else /* NLS is disabled */
-
-# define _(String) (String)
-# define N_(String) String
-
-#endif /* EXV_ENABLE_NLS */
-
-#endif /* I18N_H_ */
diff --git a/src/private.h b/src/private.h
deleted file mode 100644
index 199c17f..0000000
--- a/src/private.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/*!
- @file private.h
- @brief This file is from the tz distribution at ftp://elsie.nci.nih.gov/pub/
- @version $Rev$
-*/
-#ifndef PRIVATE_H
-
-#define PRIVATE_H
-
-/*
-** This file is in the public domain, so clarified as of
-** 1996-06-05 by Arthur David Olson (arthur_david_olson at nih.gov).
-*/
-
-/*
-** This header is for use ONLY with the time conversion code.
-** There is no guarantee that it will remain unchanged,
-** or that it will remain at all.
-** Do NOT copy it to any system include directory.
-** Thank you!
-*/
-
-/*
-** ID
-*/
-
-#ifndef lint
-#ifndef NOID
-static char privatehid[] = "@(#)private.h 7.53";
-#endif /* !defined NOID */
-#endif /* !defined lint */
-
-/* ahu: moved required preprocessor symbols to config.h */
-
-/* ahu: disable warnings */
-#ifdef _MSC_VER
-// disable warning 'uses old-style declarator' C4131
-#pragma warning (disable: 4131)
-#endif
-
-/*
-** Nested includes
-*/
-
-#include "sys/types.h" /* for time_t */
-#include "stdio.h"
-#include "errno.h"
-#include "string.h"
-#include "limits.h" /* for CHAR_BIT */
-#include "time.h"
-#include "stdlib.h"
-
-/* ahu: added io.h for MSVC */
-#ifdef _MSC_VER
-# include "io.h"
-#endif
-
-/* ahu: deleted include libintl.h */
-
-/* ahu: deleted include sys/wait.h and WIFEXITED, WEXITSTATUS macros */
-
-#if EXV_HAVE_UNISTD_H - 0
-#include "unistd.h" /* for F_OK and R_OK */
-#endif /* EXV_HAVE_UNISTD_H - 0 */
-
-#if !(EXV_HAVE_UNISTD_H - 0)
-#ifndef F_OK
-#define F_OK 0
-#endif /* !defined F_OK */
-#ifndef R_OK
-#define R_OK 4
-#endif /* !defined R_OK */
-#endif /* !(EXV_HAVE_UNISTD_H - 0) */
-
-/* Unlike <ctype.h>'s isdigit, this also works if c < 0 | c > UCHAR_MAX. */
-#define is_digit(c) ((unsigned)(c) - '0' <= 9)
-
-/*
-** Workarounds for compilers/systems.
-*/
-
-/*
-** SunOS 4.1.1 cc lacks prototypes.
-*/
-
-#ifndef P
-#ifdef __STDC__
-#define P(x) x
-#endif /* defined __STDC__ */
-#ifndef __STDC__
-#define P(x) ()
-#endif /* !defined __STDC__ */
-#endif /* !defined P */
-
-/*
-** SunOS 4.1.1 headers lack EXIT_SUCCESS.
-*/
-
-#ifndef EXIT_SUCCESS
-#define EXIT_SUCCESS 0
-#endif /* !defined EXIT_SUCCESS */
-
-/*
-** SunOS 4.1.1 headers lack EXIT_FAILURE.
-*/
-
-#ifndef EXIT_FAILURE
-#define EXIT_FAILURE 1
-#endif /* !defined EXIT_FAILURE */
-
-/*
-** SunOS 4.1.1 headers lack FILENAME_MAX.
-*/
-
-#ifndef FILENAME_MAX
-
-#ifndef MAXPATHLEN
-#ifdef unix
-#include "sys/param.h"
-#endif /* defined unix */
-#endif /* !defined MAXPATHLEN */
-
-#ifdef MAXPATHLEN
-#define FILENAME_MAX MAXPATHLEN
-#endif /* defined MAXPATHLEN */
-#ifndef MAXPATHLEN
-#define FILENAME_MAX 1024 /* Pure guesswork */
-#endif /* !defined MAXPATHLEN */
-
-#endif /* !defined FILENAME_MAX */
-
-/* ahu: deleted unlink declaration and remove define */
-
-/* ahu: deleted errno declaration */
-
-/* ahu: deleted private function declarations */
-
-/*
-** Finally, some convenience items.
-*/
-
-#ifndef TRUE
-#define TRUE 1
-#endif /* !defined TRUE */
-
-#ifndef FALSE
-#define FALSE 0
-#endif /* !defined FALSE */
-
-#ifndef TYPE_BIT
-#define TYPE_BIT(type) (sizeof (type) * CHAR_BIT)
-#endif /* !defined TYPE_BIT */
-
-#ifndef TYPE_SIGNED
-#define TYPE_SIGNED(type) (((type) -1) < 0)
-#endif /* !defined TYPE_SIGNED */
-
-#ifndef INT_STRLEN_MAXIMUM
-/*
-** 302 / 1000 is log10(2.0) rounded up.
-** Subtract one for the sign bit if the type is signed;
-** add one for integer division truncation;
-** add one more for a minus sign if the type is signed.
-*/
-#define INT_STRLEN_MAXIMUM(type) \
- ((TYPE_BIT(type) - TYPE_SIGNED(type)) * 302 / 1000 + 1 + TYPE_SIGNED(type))
-#endif /* !defined INT_STRLEN_MAXIMUM */
-
-/*
-** INITIALIZE(x)
-*/
-
-#ifndef GNUC_or_lint
-#ifdef lint
-#define GNUC_or_lint
-#endif /* defined lint */
-#ifndef lint
-#ifdef __GNUC__
-#define GNUC_or_lint
-#endif /* defined __GNUC__ */
-#endif /* !defined lint */
-#endif /* !defined GNUC_or_lint */
-
-#ifndef INITIALIZE
-#ifdef GNUC_or_lint
-#define INITIALIZE(x) ((x) = 0)
-#endif /* defined GNUC_or_lint */
-#ifndef GNUC_or_lint
-#define INITIALIZE(x)
-#endif /* !defined GNUC_or_lint */
-#endif /* !defined INITIALIZE */
-
-/* ahu: deleted definition of _(msgid) macro */
-
-#ifndef TZ_DOMAIN
-#define TZ_DOMAIN "tz"
-#endif /* !defined TZ_DOMAIN */
-
-#if HAVE_INCOMPATIBLE_CTIME_R
-#undef asctime_r
-#undef ctime_r
-char *asctime_r P((struct tm const *, char *));
-char *ctime_r P((time_t const *, char *));
-#endif /* HAVE_INCOMPATIBLE_CTIME_R */
-
-/*
-** UNIX was a registered trademark of The Open Group in 2003.
-*/
-
-#endif /* !defined PRIVATE_H */
diff --git a/src/timegm.h b/src/timegm.h
deleted file mode 100644
index e9592c6..0000000
--- a/src/timegm.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*!
- @file timegm.h
- @brief Declaration of timegm(). The implementation is in localtime.c
- @version $Rev$
-*/
-#ifndef TIMEGM_H_
-#define TIMEGM_H_
-
-#include <time.h>
-
-/*
- The following comments are copied from the Makefile of the tz distribution,
- available at ftp://elsie.nci.nih.gov/pub/:
-
- NIST-PCTS:151-2, Version 1.4, (1993-12-03) is a test suite put
- out by the National Institute of Standards and Technology
- which claims to test C and Posix conformance. If you want to pass PCTS, add
- -DPCTS
- to the end of the "CFLAGS=" line.
-
- If your system has a "zone abbreviation" field in its "struct tm"s
- (or if you decide to add such a field in your system's "time.h" file),
- add the name to a define such as
- -DTM_ZONE=tm_zone
- or
- -DTM_ZONE=_tm_zone
- to the end of the "CFLAGS=" line.
-
- If you want functions that were inspired by early versions of X3J11's work,
- add
- -DSTD_INSPIRED
- to the end of the "CFLAGS=" line.
-
- If you want to allocate state structures in localtime, add
- -DALL_STATE
- to the end of the "CFLAGS=" line. Storage is obtained by calling malloc.
-
- If you want Source Code Control System ID's left out of object modules, add
- -DNOID
-
- Add the following to the end of the "CFLAGS=" line as needed.
- -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified
- DST transitions if the time zone files cannot be accessed
-
- If you want to use System V compatibility code, add
- -DUSG_COMPAT
- to the end of the "CFLAGS=" line. This arrange for "timezone" and "daylight"
- variables to be kept up-to-date by the time conversion functions. Neither
- "timezone" nor "daylight" is described in X3J11's work.
-
- If you want an "altzone" variable (a la System V Release 3.1), add
- -DALTZONE
- to the end of the "CFLAGS=" line.
- This variable is not described in X3J11's work.
-
- If your system has a "GMT offset" field in its "struct tm"s
- (or if you decide to add such a field in your system's "time.h" file),
- add the name to a define such as
- -DTM_GMTOFF=tm_gmtoff
- or
- -DTM_GMTOFF=_tm_gmtoff
- to the end of the "CFLAGS=" line.
- Neither tm_gmtoff nor _tm_gmtoff is described in X3J11's work;
- in its work, use of "tm_gmtoff" is described as non-conforming.
- Both Linux and BSD have done the equivalent of defining TM_GMTOFF in
- their recent releases.
-
- If you want a "gtime" function (a la MACH), add
- -DCMUCS
- to the end of the "CFLAGS=" line
- This function is not described in X3J11's work.
-*/
-
-#define STD_INSPIRED
-#define NOID
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// The UTC version of mktime
-/* rmills - timegm is replaced with _mkgmtime on VC 2005 and up */
-/* - see localtime.c */
-#if !defined(_MSC_VER) || (_MSC_VER < 1400)
-time_t timegm(struct tm * const tmp);
-#else
-#define timegm _mkgmtime
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // #ifndef TIMEGM_H_
diff --git a/src/tzfile.h b/src/tzfile.h
deleted file mode 100644
index f8ff103..0000000
--- a/src/tzfile.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/*!
- @file tzfile.h
- @brief This file is from the tz distribution at ftp://elsie.nci.nih.gov/pub/
- @version $Rev$
-*/
-#ifndef TZFILE_H
-
-#define TZFILE_H
-
-/*
-** This file is in the public domain, so clarified as of
-** 1996-06-05 by Arthur David Olson (arthur_david_olson at nih.gov).
-*/
-
-/*
-** This header is for use ONLY with the time conversion code.
-** There is no guarantee that it will remain unchanged,
-** or that it will remain at all.
-** Do NOT copy it to any system include directory.
-** Thank you!
-*/
-
-/*
-** ID
-*/
-
-#ifndef lint
-#ifndef NOID
-static char tzfilehid[] = "@(#)tzfile.h 7.14";
-#endif /* !defined NOID */
-#endif /* !defined lint */
-
-/*
-** Information about time zone files.
-*/
-
-#ifndef TZDIR
-#define TZDIR "/usr/local/etc/zoneinfo" /* Time zone object file directory */
-#endif /* !defined TZDIR */
-
-#ifndef TZDEFAULT
-#define TZDEFAULT "localtime"
-#endif /* !defined TZDEFAULT */
-
-#ifndef TZDEFRULES
-#define TZDEFRULES "posixrules"
-#endif /* !defined TZDEFRULES */
-
-/*
-** Each file begins with. . .
-*/
-
-#define TZ_MAGIC "TZif"
-
-struct tzhead {
- char tzh_magic[4]; /* TZ_MAGIC */
- char tzh_reserved[16]; /* reserved for future use */
- char tzh_ttisgmtcnt[4]; /* coded number of trans. time flags */
- char tzh_ttisstdcnt[4]; /* coded number of trans. time flags */
- char tzh_leapcnt[4]; /* coded number of leap seconds */
- char tzh_timecnt[4]; /* coded number of transition times */
- char tzh_typecnt[4]; /* coded number of local time types */
- char tzh_charcnt[4]; /* coded number of abbr. chars */
-};
-
-/*
-** . . .followed by. . .
-**
-** tzh_timecnt (char [4])s coded transition times a la time(2)
-** tzh_timecnt (unsigned char)s types of local time starting at above
-** tzh_typecnt repetitions of
-** one (char [4]) coded UTC offset in seconds
-** one (unsigned char) used to set tm_isdst
-** one (unsigned char) that's an abbreviation list index
-** tzh_charcnt (char)s '
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list