Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/vnc/patches/vnc-autotools-2.patch

    Contents of /trunk/vnc/patches/vnc-autotools-2.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 640 - (show annotations) (download)
    Tue Jun 3 21:03:10 2008 UTC (15 years, 11 months ago) by niro
    File size: 9594 byte(s) 
    -added several new fixes from fedora
    1 --- /dev/null 2007-02-16 09:39:42.585819347 +0100
    2 +++ vnc-4_1_2-unixsrc/common/Makefile.am 2007-02-16 09:51:11.000000000 +0100
    3 @@ -0,0 +1,5 @@
    4 +SUBDIRS = \
    5 + rdr \
    6 + network \
    7 + Xregion \
    8 + rfb
    9 --- /dev/null 2007-02-16 09:39:42.585819347 +0100
    10 +++ vnc-4_1_2-unixsrc/common/rfb/Makefile.am 2007-02-16 09:51:11.000000000 +0100
    11 @@ -0,0 +1,136 @@
    12 +lib_LTLIBRARIES = librfb.la
    13 +
    14 +librfb_la_SOURCES = \
    15 + Blacklist.cxx \
    16 + Blacklist.h \
    17 + CConnection.cxx \
    18 + CConnection.h \
    19 + CMsgHandler.cxx \
    20 + CMsgHandler.h \
    21 + CMsgReader.cxx \
    22 + CMsgReader.h \
    23 + CMsgReaderV3.cxx \
    24 + CMsgReaderV3.h \
    25 + CMsgWriter.cxx \
    26 + CMsgWriter.h \
    27 + CMsgWriterV3.cxx \
    28 + CMsgWriterV3.h \
    29 + ColourCube.h \
    30 + ColourMap.h \
    31 + ComparingUpdateTracker.cxx \
    32 + ComparingUpdateTracker.h \
    33 + Configuration.cxx \
    34 + Configuration.h \
    35 + ConnParams.cxx \
    36 + ConnParams.h \
    37 + CSecurity.h \
    38 + CSecurityNone.h \
    39 + CSecurityVncAuth.cxx \
    40 + CSecurityVncAuth.h \
    41 + Cursor.cxx \
    42 + Cursor.h \
    43 + Decoder.cxx \
    44 + Decoder.h \
    45 + d3des.c \
    46 + d3des.h \
    47 + Encoder.cxx \
    48 + Encoder.h \
    49 + encodings.cxx \
    50 + encodings.h \
    51 + Exception.h \
    52 + hextileConstants.h \
    53 + hextileDecode.h \
    54 + HextileDecoder.cxx \
    55 + HextileDecoder.h \
    56 + hextileEncode.h \
    57 + HextileEncoder.cxx \
    58 + HextileEncoder.h \
    59 + Hostname.h \
    60 + HTTPServer.cxx \
    61 + HTTPServer.h \
    62 + ImageGetter.h \
    63 + InputHandler.h \
    64 + KeyRemapper.cxx \
    65 + KeyRemapper.h \
    66 + keysymdef.h \
    67 + Logger.cxx \
    68 + Logger_file.cxx \
    69 + Logger_file.h \
    70 + Logger.h \
    71 + Logger_stdio.cxx \
    72 + Logger_stdio.h \
    73 + LogWriter.cxx \
    74 + LogWriter.h \
    75 + msgTypes.h \
    76 + Password.cxx \
    77 + Password.h \
    78 + PixelBuffer.cxx \
    79 + PixelBuffer.h \
    80 + PixelFormat.cxx \
    81 + PixelFormat.h \
    82 + Pixel.h \
    83 + RawDecoder.cxx \
    84 + RawDecoder.h \
    85 + RawEncoder.cxx \
    86 + RawEncoder.h \
    87 + Rect.h \
    88 + Region.cxx \
    89 + Region.h \
    90 + rreDecode.h \
    91 + RREDecoder.cxx \
    92 + RREDecoder.h \
    93 + rreEncode.h \
    94 + RREEncoder.cxx \
    95 + RREEncoder.h \
    96 + SConnection.cxx \
    97 + SConnection.h \
    98 + SDesktop.h \
    99 + secTypes.cxx \
    100 + secTypes.h \
    101 + ServerCore.cxx \
    102 + ServerCore.h \
    103 + SMsgHandler.cxx \
    104 + SMsgHandler.h \
    105 + SMsgReader.cxx \
    106 + SMsgReader.h \
    107 + SMsgReaderV3.cxx \
    108 + SMsgReaderV3.h \
    109 + SMsgWriter.cxx \
    110 + SMsgWriter.h \
    111 + SMsgWriterV3.cxx \
    112 + SMsgWriterV3.h \
    113 + SSecurityFactoryStandard.cxx \
    114 + SSecurityFactoryStandard.h \
    115 + SSecurity.h \
    116 + SSecurityNone.h \
    117 + SSecurityVncAuth.cxx \
    118 + SSecurityVncAuth.h \
    119 + Threading.h \
    120 + Timer.cxx \
    121 + Timer.h \
    122 + TransImageGetter.cxx \
    123 + TransImageGetter.h \
    124 + transInitTempl.h \
    125 + transTempl.h \
    126 + TrueColourMap.h \
    127 + UpdateTracker.cxx \
    128 + UpdateTracker.h \
    129 + UserPasswdGetter.h \
    130 + util.cxx \
    131 + util.h \
    132 + VNCSConnectionST.cxx \
    133 + VNCSConnectionST.h \
    134 + VNCServer.h \
    135 + VNCServerST.cxx \
    136 + VNCServerST.h \
    137 + zrleDecode.h \
    138 + ZRLEDecoder.cxx \
    139 + ZRLEDecoder.h \
    140 + zrleEncode.h \
    141 + ZRLEEncoder.cxx \
    142 + ZRLEEncoder.h
    143 +
    144 +librfb_la_LIBADD = \
    145 + $(top_srcdir)/network/libnetwork.la \
    146 + $(top_srcdir)/rdr/librdr.la \
    147 + $(top_srcdir)/Xregion/libXregion.la
    148 --- /dev/null 2007-02-16 09:39:42.585819347 +0100
    149 +++ vnc-4_1_2-unixsrc/common/rdr/Makefile.am 2007-02-16 09:51:11.000000000 +0100
    150 @@ -0,0 +1,30 @@
    151 +noinst_LTLIBRARIES = librdr.la
    152 +
    153 +librdr_la_SOURCES = \
    154 + Exception.cxx \
    155 + FdInStream.h \
    156 + FixedMemOutStream.h \
    157 + HexOutStream.cxx \
    158 + InStream.h \
    159 + OutStream.h \
    160 + SubstitutingInStream.h \
    161 + ZlibInStream.h \
    162 + Exception.h \
    163 + FdOutStream.cxx \
    164 + HexInStream.cxx \
    165 + HexOutStream.h \
    166 + MemInStream.h \
    167 + RandomStream.cxx \
    168 + types.h \
    169 + ZlibOutStream.cxx \
    170 + FdInStream.cxx \
    171 + FdOutStream.h \
    172 + HexInStream.h \
    173 + InStream.cxx \
    174 + MemOutStream.h \
    175 + RandomStream.h \
    176 + ZlibInStream.cxx \
    177 + ZlibOutStream.h
    178 +
    179 +librdr_la_LIBADD = \
    180 + -lz
    181 --- /dev/null 2007-02-16 09:39:42.585819347 +0100
    182 +++ vnc-4_1_2-unixsrc/common/configure.ac 2007-02-16 09:51:11.000000000 +0100
    183 @@ -0,0 +1,42 @@
    184 +# -*- Autoconf -*-
    185 +# Process this file with autoconf to produce a configure script.
    186 +
    187 +AC_PREREQ(2.61)
    188 +AC_INIT([vnc-libs], 4.1.2, [bugzilla.redhat.com])
    189 +AC_CONFIG_HEADER([config.h])
    190 +AM_INIT_AUTOMAKE([-Wall -Werror foreign])
    191 +
    192 +# Checks for programs.
    193 +AC_PROG_CXX
    194 +AC_PROG_CC
    195 +AC_PROG_LIBTOOL
    196 +
    197 +# Checks for libraries.
    198 +
    199 +# Checks for header files.
    200 +AC_HEADER_STDC
    201 +AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/timeb.h unistd.h])
    202 +
    203 +# Checks for typedefs, structures, and compiler characteristics.
    204 +AC_HEADER_STDBOOL
    205 +AC_C_CONST
    206 +AC_C_INLINE
    207 +AC_TYPE_SIZE_T
    208 +AC_HEADER_TIME
    209 +AC_STRUCT_TM
    210 +
    211 +# Checks for library functions.
    212 +AC_FUNC_ERROR_AT_LINE
    213 +AC_FUNC_MEMCMP
    214 +AC_FUNC_SELECT_ARGTYPES
    215 +AC_TYPE_SIGNAL
    216 +AC_FUNC_STRFTIME
    217 +AC_FUNC_VPRINTF
    218 +AC_CHECK_FUNCS([ftime gethostbyname getpass gettimeofday inet_ntoa memchr memmove memset select socket strcasecmp strchr strerror strncasecmp])
    219 +
    220 +AC_CONFIG_FILES([Makefile
    221 + Xregion/Makefile
    222 + network/Makefile
    223 + rdr/Makefile
    224 + rfb/Makefile])
    225 +AC_OUTPUT
    226 --- /dev/null 2007-02-16 09:39:42.585819347 +0100
    227 +++ vnc-4_1_2-unixsrc/common/Xregion/Makefile.am 2007-02-16 09:51:11.000000000 +0100
    228 @@ -0,0 +1,6 @@
    229 +noinst_LTLIBRARIES = libXregion.la
    230 +
    231 +libXregion_la_SOURCES = \
    232 + Region.c \
    233 + region.h \
    234 + Xregion.h
    235 --- /dev/null 2007-02-16 09:39:42.585819347 +0100
    236 +++ vnc-4_1_2-unixsrc/common/network/Makefile.am 2007-02-16 09:51:11.000000000 +0100
    237 @@ -0,0 +1,6 @@
    238 +noinst_LTLIBRARIES = libnetwork.la
    239 +
    240 +libnetwork_la_SOURCES = \
    241 + Socket.h \
    242 + TcpSocket.cxx \
    243 + TcpSocket.h
    244 --- /dev/null 2007-02-16 09:39:42.585819347 +0100
    245 +++ vnc-4_1_2-unixsrc/unix/Makefile.am 2007-02-16 09:51:11.000000000 +0100
    246 @@ -0,0 +1,6 @@
    247 +SUBDIRS = \
    248 + tx \
    249 + vncpasswd \
    250 + vncviewer \
    251 + vncconfig \
    252 + x0vncserver
    253 --- /dev/null 2007-02-16 09:39:42.585819347 +0100
    254 +++ vnc-4_1_2-unixsrc/unix/tx/Makefile.am 2007-02-16 09:51:11.000000000 +0100
    255 @@ -0,0 +1,25 @@
    256 +noinst_LTLIBRARIES = libtx.la
    257 +
    258 +libtx_la_SOURCES = \
    259 + TXButton.h \
    260 + TXDialog.h \
    261 + TXEntry.h \
    262 + TXCheckbox.h \
    263 + TXImage.cxx \
    264 + TXImage.h \
    265 + TXLabel.h \
    266 + TXMenu.cxx \
    267 + TXMenu.h \
    268 + TXMsgBox.h \
    269 + TXScrollbar.cxx \
    270 + TXScrollbar.h \
    271 + TXViewport.cxx \
    272 + TXViewport.h \
    273 + TXWindow.cxx \
    274 + TXWindow.h
    275 +
    276 +AM_CPPFLAGS = \
    277 + -I$(top_srcdir)/../common/
    278 +
    279 +libtx_la_LIBADD = \
    280 + -lX11
    281 --- /dev/null 2007-02-16 09:39:42.585819347 +0100
    282 +++ vnc-4_1_2-unixsrc/unix/vncpasswd/Makefile.am 2007-02-16 09:51:11.000000000 +0100
    283 @@ -0,0 +1,10 @@
    284 +bin_PROGRAMS = vncpasswd
    285 +
    286 +vncpasswd_SOURCES = \
    287 + vncpasswd.cxx
    288 +
    289 +AM_CPPFLAGS = \
    290 + -I$(top_srcdir)/../common
    291 +
    292 +vncpasswd_LDADD = \
    293 + $(top_srcdir)/../common/rfb/librfb.la
    294 --- /dev/null 2007-02-16 09:39:42.585819347 +0100
    295 +++ vnc-4_1_2-unixsrc/unix/vncconfig/Makefile.am 2007-02-16 09:51:11.000000000 +0100
    296 @@ -0,0 +1,17 @@
    297 +bin_PROGRAMS = vncconfig
    298 +
    299 +vncconfig_SOURCES = \
    300 + buildtime.c \
    301 + QueryConnectDialog.cxx \
    302 + QueryConnectDialog.h \
    303 + vncconfig.cxx \
    304 + vncExt.c \
    305 + vncExt.h
    306 +
    307 +AM_CPPFLAGS = \
    308 + -I$(top_srcdir)/../common \
    309 + -I$(top_srcdir)/tx
    310 +
    311 +vncconfig_LDADD = \
    312 + $(top_srcdir)/../common/rfb/librfb.la \
    313 + $(top_srcdir)/tx/libtx.la
    314 --- /dev/null 2007-02-16 09:39:42.585819347 +0100
    315 +++ vnc-4_1_2-unixsrc/unix/configure.ac 2007-02-16 09:51:11.000000000 +0100
    316 @@ -0,0 +1,52 @@
    317 +# -*- Autoconf -*-
    318 +# Process this file with autoconf to produce a configure script.
    319 +
    320 +AC_PREREQ(2.61)
    321 +AC_INIT([vnc], 4.1.2, [bugzilla.redhat.com])
    322 +AC_CONFIG_SRCDIR([x0vncserver/buildtime.c])
    323 +AC_CONFIG_HEADER([config.h])
    324 +AM_INIT_AUTOMAKE([-Wall -Werror foreign])
    325 +
    326 +# Checks for programs.
    327 +AC_PROG_CXX
    328 +AC_PROG_CC
    329 +AC_PROG_LIBTOOL
    330 +
    331 +# Checks for libraries.
    332 +
    333 +# Checks for header files.
    334 +AC_PATH_X
    335 +AC_HEADER_STDC
    336 +AC_HEADER_SYS_WAIT
    337 +AC_CHECK_HEADERS([fcntl.h stdlib.h string.h strings.h sys/time.h termios.h unistd.h])
    338 +
    339 +# Checks for typedefs, structures, and compiler characteristics.
    340 +AC_HEADER_STDBOOL
    341 +AC_C_CONST
    342 +AC_C_INLINE
    343 +AC_C_RESTRICT
    344 +AC_TYPE_SIZE_T
    345 +AC_HEADER_TIME
    346 +
    347 +# Checks for library functions.
    348 +AC_FUNC_ERROR_AT_LINE
    349 +AC_FUNC_FORK
    350 +AC_FUNC_LSTAT
    351 +AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
    352 +AC_FUNC_MALLOC
    353 +AC_FUNC_MEMCMP
    354 +AC_FUNC_REALLOC
    355 +AC_FUNC_SELECT_ARGTYPES
    356 +AC_TYPE_SIGNAL
    357 +AC_FUNC_STAT
    358 +AC_FUNC_VPRINTF
    359 +AC_FUNC_WAIT3
    360 +AC_CHECK_FUNCS([memset mkdir select setenv strchr strdup strerror strspn strtol])
    361 +
    362 +AC_CONFIG_FILES([Makefile
    363 + tx/Makefile
    364 + vncconfig/Makefile
    365 + vncpasswd/Makefile
    366 + vncviewer/Makefile
    367 + x0vncserver/Makefile])
    368 +AC_OUTPUT
    369 --- /dev/null 2007-02-16 09:39:42.585819347 +0100
    370 +++ vnc-4_1_2-unixsrc/unix/vncviewer/Makefile.am 2007-02-16 09:51:11.000000000 +0100
    371 @@ -0,0 +1,24 @@
    372 +bin_PROGRAMS = vncviewer
    373 +
    374 +vncviewer_SOURCES = \
    375 + AboutDialog.h \
    376 + buildtime.c \
    377 + CConn.cxx \
    378 + CConn.h \
    379 + DesktopWindow.cxx \
    380 + DesktopWindow.h \
    381 + InfoDialog.h \
    382 + OptionsDialog.h \
    383 + parameters.h \
    384 + PasswdDialog.h \
    385 + ServerDialog.h \
    386 + vncviewer.cxx
    387 +
    388 +AM_CPPFLAGS = \
    389 + -I$(top_srcdir)/../common \
    390 + -I$(top_srcdir)/tx
    391 +
    392 +vncviewer_LDADD = \
    393 + $(top_srcdir)/../common/rfb/librfb.la \
    394 + $(top_srcdir)/tx/libtx.la \
    395 + -lXext
    396 --- /dev/null 2007-02-16 09:39:42.585819347 +0100
    397 +++ vnc-4_1_2-unixsrc/unix/x0vncserver/Makefile.am 2007-02-16 09:51:11.000000000 +0100
    398 @@ -0,0 +1,20 @@
    399 +bin_PROGRAMS = x0vncserver
    400 +
    401 +x0vncserver_SOURCES = \
    402 + buildtime.c \
    403 + Image.cxx \
    404 + Image.h \
    405 + x0vncserver.cxx \
    406 + $(top_srcdir)/vncconfig/QueryConnectDialog.h \
    407 + $(top_srcdir)/vncconfig/QueryConnectDialog.cxx
    408 +
    409 +AM_CPPFLAGS = \
    410 + -I$(top_srcdir)/../common \
    411 + -I$(top_srcdir)/vncconfig \
    412 + -I$(top_srcdir)/tx
    413 +
    414 +x0vncserver_LDADD = \
    415 + $(top_srcdir)/../common/rfb/librfb.la \
    416 + $(top_srcdir)/tx/libtx.la \
    417 + -lXext \
    418 + -lXtst